#377 - For AdminPresentationCollection annotated collections with an addType of PERSIST and an extended polymorphic type, the incorrect type is created upon save
Merge remote-tracking branch 'origin/BroadleafCommerce-3.0.x' into develop

Conflicts:
	admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/service/AdminEntityServiceImpl.java