OT-2824 DRYed up package weight stuff in ups requests