Pilot blades enabling/disabling in pixel digitizer
Merged CMSSW_7_1_X from repository cms-sw
Fixing conflicts
Fixing conflicts2
Merge pull request #3754 from ahazi137/pilot-blade-in-pixdigitizer

SimTracker/SiPixelDigitizer -- Pilot blades enabling/disabling in pixel digitizer