Shipment#to_package Use symbols for state.

Fixes #3326
Fixes #3327