renamed args
Updates ShipmentDisplay with new shipment status properties.
Merge remote-tracking branch 'merchello/1.5.0' into 1.5.0
Merge pull request #935 from rustyswayne/1.5.0

Updates ShipmentDisplay with new shipment status properties.