Rebase v28r2p1-patches with latest changes from 2018-patches
Merges in the changes from the conclusion of the 2018-patches campaign.
Two files have conflicts: StrippingCharmedBaryonSL and Beauty2Charm_Lb2XBuilder. For these conflicts the version in v28r2p1-patches is retained.