Solution for securityCode validation on encrypted CC#'s
Set primary account address as the default

The shipping select no longer defaults to the primary account as
orderFulfillment.getShippingAddress() is no longer null with recent
changes. This checks to see if the addressID returned is an empty string
and if so, sets the accountAddressID to be the account primary
addressID.
Update conditional statement to set primary address

Updated conditional statement based on Greg's feedback.
Merge remote-tracking branch 'jsieber-aca/hotfix-defaultShippingAddress' into hotfix
Added the update script default data
Merge branch 'develop' into feature-productbundle
Updated Version 3.4.015.009
Merge branch 'hotfix'
Updated Version 3.4.016
Merge branch 'master' into develop

Conflicts:
	version.txt
Fixed setting attributeValueOption
Fixes setting attributeValueOption
Updated the UI to add attributes to attributeOptions
Updated Version 3.4.016.010
Fixes v3_3 update script.
Merge branch 'hotfix'
Updated Version 3.4.017
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge branch 'develop' into feature-r10

Conflicts:
	version.txt
Merge pull request #2379 from ten24/feature-ccvalidationfix

Solution for securityCode validation on encrypted CC#'s