Merge remote-tracking branch 'musella/topic_72x_porting_rebase'

Conflicts:
	MicroAODProducers/plugins/PhotonProducer.cc