More forward ports from CMSSW_7_2_X

This is a few more PR which were approved in CMSSW_7_2_X and I now ported to CMSSW_7_3_X. The standard git merge worked without conflicts (which of course does not mean that the code is logically correct).