Merge branch 'FixesForLHCBPS1822' into '2017-patches'
Fix for LHCBPS-1822
See merge request !493 (merged)
(cherry picked from commit f28c4324)
5870cff2 Fix for LHCBPS-1822
Fix for LHCBPS-1822
See merge request !493 (merged)
(cherry picked from commit f28c4324)
5870cff2 Fix for LHCBPS-1822