Fix merge conflicts from clash with #4714

Conflicts:
	SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.cc