Add user ID to shipping packages
Merge pull request #4618 from leewillis77/add_user_id_to_packages

[2.2] Add user ID to shipping packages