BLC-475 : Address doesn't declare a getter or setter for isActive but AddressImpl does
BLC-809 : When adding a MVEL compiled rule to the expressionCache, the result was being stored in a local variable.   This was causing the MVEL rules to not work on the very first execution of the rule.    This effected Page and StructuredContent rules.
Fix , also addresses a minor JavaDoc typo in PageDefaultRuleProcessor.
(cherry-picked from cdaf360)
BLC-809 : When adding a MVEL compiled rule to the expressionCache, the result was being stored in a local variable.   This was causing the MVEL rules to not work on the very first execution of the rule.    This effected Page and StructuredContent rules.
Fix , also addresses a minor JavaDoc typo in PageDefaultRuleProcessor.
(cherry-picked from cdaf360)
(cherry-picked from c33e5fd)
BLC-809 : When adding a MVEL compiled rule to the expressionCache, the result was being stored in a local variable.   This was causing the MVEL rules to not work on the very first execution of the rule.    This effected Page and StructuredContent rules.
Fix , also addresses a minor JavaDoc typo in PageDefaultRuleProcessor.
(cherry-picked from cdaf360)
(cherry-picked from c33e5fd)
BLC-810 : dialog title "Asset Search" should be add to i18n messages properties file
BLC-812 : Product clone messages should be added i18n strings.
BLC-778 : Static Asset upload encoding error
Merge remote-tracking branch 'remotes/origin/BroadleafCommerce-2.0.x' into BroadleafCommerce-2.1.x

Conflicts:
	admin/broadleaf-admin-module/src/main/java/org/broadleafcommerce/admin/client/MerchandisingMessages.java
	admin/broadleaf-admin-module/src/main/resources/org/broadleafcommerce/admin/client/MerchandisingMessages.properties
Merge remote-tracking branch 'remotes/origin/BroadleafCommerce-2.0.x' into BroadleafCommerce-2.1.x

Conflicts:
	admin/broadleaf-admin-module/src/main/java/org/broadleafcommerce/admin/client/MerchandisingMessages.java
	admin/broadleaf-admin-module/src/main/resources/org/broadleafcommerce/admin/client/MerchandisingMessages.properties
Merge remote-tracking branch 'remotes/origin/BroadleafCommerce-2.1.x' into develop

Conflicts:
	admin/broadleaf-admin-module/src/main/java/org/broadleafcommerce/admin/client/MerchandisingMessages.java
	admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/client/OpenAdminMessages.java
Merge remote-tracking branch 'remotes/origin/develop' into develop-2.3

Conflicts:
	core/broadleaf-profile/src/main/java/org/broadleafcommerce/profile/core/domain/AddressImpl.java