Fix CMSSW_7_0_X to CMSSW_7_1_X forward port

This will forward port to CMSSW_7_1_X the following PR:

- #4446
- #4392
- #4431

while it will ignore (mostly due to large amount of conflicts):

- #4255
- #4351