Fix cmsdist branch for SLHC on slc6.
Merge pull request #605 from degano/slhc_slc6_branchfix

Fix cmsdist branch for SLHC on slc6.
Merge remote branch 'origin/IB/CMSSW_7_0_X/stable' into IB/CMSSW_7_0_X/stable
Merge remote branch 'origin/IB/CMSSW_7_1_X/stable' into IB/CMSSW_7_0_X/stable