Comment out extension handler for merging sb and prod collection records
Support non-cloning and CRUD operations for adorned targets
Remove unused functionality
Transform Product.additionalSkus collection by using a modelled entity for the join table (ProductSkuXref), which assists with advanced functionality
Re-instate cache usage for metadata in SkuCustomPersistenceHandler
Support unowned map and map fields behavior
Refactor for clarity
Update cascade settings
Update cascade settings
Refactor for clarity
Add catalog discrimination
Configure offer rules for unowned map handling and simple rule persistence
Add better refresh handling support for Product-->Sku relationships
Fix setting media on an additional sku add
Support SIMPLE_RULE map fields
Rename some fields for better overall backwards compatibility
Include unowned collection support for RULE_WITH_QUANTITY fields
Simplify Media handling code
Remove pre-clone information - it is no longer needed, since we no longer have an explicit unowned collection concept
Merge remote-tracking branch 'origin/prod_sandbox_original_id_refactor' into multi-tenant-refactor

Conflicts:
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/offer/domain/OfferImpl.java