2-2 Implemented fix for duplicate addresses being created in checkout

This implements #4506 into 2-2-stable branch.