#762 - Fix license header
#735 - MapFieldPersistenceProvider should not allow subsequent processing
Revert: Backport #746 to the 3.0 line (efcfc54e4a273aba16a20af107416869be22dcd4)
Merge remote-tracking branch 'origin/BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x

Conflicts:
	admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/service/persistence/module/provider/MapFieldPersistenceProvider.java
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/search/dao/SolrIndexDao.java
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/search/dao/SolrIndexDaoImpl.java
	core/broadleaf-framework/src/main/resources/config/bc/jpa/domain/Solr.orm.xml