Merge remote-tracking branch 'origin/cms-sw/CMSSW_6_2_X_SLHC' into CMSSW_6_2_X_SLHC

Conflicts:
	SLHCUpgradeSimulations/Configuration/python/gemCustoms.py
Merge remote-tracking branch 'origin/gem-sw/CMSSW_6_2_X_SLHC' into CMSSW_6_2_X_SLHC