include changes needed for new scram/config
Merge pull request #1016 from smuzaffar/IB/CMSSW_6_2_X/stable

include changes needed for new scram/config
Merge remote branch 'origin/IB/CMSSW_6_2_X/stable' into IB/CMSSW_7_0_X/stable