CMSSW_7_0_3_patch1

Changes since CMSSW_7_0_3:

  1. 3121 from @venturia: New attempt to backport #2910 and #3023 to 70x created: 2014-03-31 19:05:44 merged: 2014-04-03 17:17:04