[2.2] Merge ship to billing and billing only options

+ update options, update files to use new option + function Closes #5284