Prepared for CMSSW_7_3_0 on slc6_amd64_gcc491
fixes for fwlite/partial cmssw build
Merge pull request #1257 from smuzaffar/IB/CMSSW_7_3_X/gcc491

Ib/cmssw 7 3 x/gcc491
Merge remote branch 'origin/IB/CMSSW_7_3_X/gcc491' into IB/CMSSW_7_0_X/stable
Merge remote branch 'origin/IB/CMSSW_7_4_X/stable' into IB/CMSSW_7_0_X/stable