(PUP-1420) Move global StateMachine to Puppet::Zone
Merge pull request #2250 from crankharder/move_statemachine_2

(PUP-1420) Move global StateMachine to Puppet::Zone