Merge branch '20734j' into 20734
issue #20734: Work shipment objects towards usability.
issue 20734: Add issue to shipping function. Scale back scope.
Merging in John's branch.
Correct ShipmentLine orm and push to origin.