Merge remote-tracking branch 'merchello/1.4.0' into 1.4.0
Patches multiple shipment creation issue and asserts shipment key is associated with the order line item
Merge pull request #879 from rustyswayne/1.4.0

Multiple shipments