#383 : AdminPresentationCollection annotated collections with addType PERSIST should allow polymorphic type selection when applicable
(cherry picked from commit 08b7acf)
Merge remote-tracking branch 'origin/BroadleafCommerce-3.0.x' into develop

Conflicts:
	admin/broadleaf-admin-module/src/main/java/org/broadleafcommerce/admin/web/controller/entity/AdminProductController.java
	admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/web/controller/entity/AdminBasicEntityController.java
Merge remote-tracking branch 'origin/BroadleafCommerce-3.0.x' into develop

Conflicts:
	admin/broadleaf-admin-module/src/main/java/org/broadleafcommerce/admin/web/controller/entity/AdminProductController.java
	admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/web/controller/entity/AdminBasicEntityController.java