CMSSW_6_2_0_SLHC15_fixTk1

Changes since CMSSW_6_2_0_SLHC15:

1. 4576 from @venturia: Pixel detid rollback geometry l1 simulation created: 2014-07-09 07:20:47 merged: 2014-07-09 10:15:29