Revert "Merge branch 'CMSSW_7_1_X' of https://github.com/cms-sw/cmssw into jetToolbox"

This reverts commit e29c64d4e86f0cd18ac083f5a07ad54502aced8f, reversing
changes made to 8120dedc6cfade5c813068fed00fb16fd87ac941.
Revert "Merge branch 'CMSSW_7_1_X' of https://github.com/cms-sw/cmssw into jetToolbox"

This reverts commit 8120dedc6cfade5c813068fed00fb16fd87ac941, reversing
changes made to 11cfc001388253fe8b0afa57bc228b98b0e32a02.