Merge branch '2018-patches' into 'S35_repos'
Propagate changes from 2018-patches to S35_repos
See merge request !826 (merged)
(cherry picked from commit 6b28cc65)
33f3677c Preparing v12r2 94f565ff Adding correction to gen-catalog 32c57f70 End of LHCb restripping datafiles bc15794e End of LHCb restripping datafiles - white space errors 03f8aaea Merge branch 'endoflhcbrestippingdata' into '2018-patches' 38d05944 Merge branch 'S35_repos' into '2018-patches'