Put zone trigger back in the ControlProtocol and out of ZoneEffectOnProductionType.
Merge remote-tracking branch 'origin/master'