Closes #1883
Updated Version 3.1.16.030
Fixes client side hibachi scope to work without routes
Merge branch 'master' into hotfix
Updated Version 3.1.17
Merge branch 'master' into develop

Conflicts:
	version.txt
Added the ability for cfc's in the /model service of an integration to
be added to the application bean factory but name-spaced by the
integrationPackage name.
Updated Version 3.1.17.031
Fixes small bug and updated version 3.1.17.032
Adds additional functionality for sku / skuName and the
ability to pass in both skuCode & skuName in content access creation
Cleans up new sku rbKeys
Updated Version 3.1.17.033
Fixes a bug with attributes when requiredFlag is null
Updated Version 3.1.18
Merge branch 'master' into develop

Conflicts:
	version.txt
Fixes validation for products and skus which are on transactions.
Merge branch 'master' into hotfix
Updated Version 3.1.19
Merge branch 'master' into develop

Conflicts:
	model/validation/Product.json
	version.txt
Merge branch 'develop' into develop-products

Conflicts:
	admin/views/entity/detailsku.cfm
	config/resourceBundles/en.properties
	model/entity/Sku.cfc
	model/validation/Address.json
	model/validation/Sku.json