Cherry-pick from the backport of Git CondDB to stripping21-patches See LHCBPS-1802
stripping21-patches