Same as #5525 (#4914 #4833 #4862 #5037 #5230 plus #5425 and other fixes)

This PR should include all fixes from
https://twiki.cern.ch/twiki/bin/view/CMS/MiniAODCSA14FollowUp
plus Sal PR (#5425) and other fixes for AK5->AK4

same as #5525 but against 72X