Replace shipment/item events
Merge pull request #1526 from winzou/state-machine

[State machine] Replace shipment and item events