fix for add payment address when skip shipping enabled
more cleanup and shipping address fix as well to match payment address fix.
updated with latest develop
Merge remote-tracking branch 'remotes/origin/B3282' into develop

Conflicts:
	catalog/includes/content/checkout/payment_address.php
	catalog/install/loadedcommerce_innodb.sql