CMSSW_7_0_6_patch2

Changes since CMSSW_7_0_6_patch1:

1. 4512 from @tlampen: Backport of PR #4354. Use word disc for TEC and TID instead of layer (printouts and file names… alca created: 2014-07-03 17:30:13 merged: 2014-07-08 16:22:18

2. 4550 from @mdhildreth: Configure SiStrip noise the same in production and validation modes! Sup… simulation created: 2014-07-08 02:42:20 merged: 2014-07-08 16:21:55