#737 - Category browsing with the DatabaseSearchService is broken
#424. Added logic to check the header first.  If the header isn't there,
it checks the isSecure() method of the request.  Otherwise, it commences
a redirect.
(cherry picked from commit e82f8af129ba07c598e2a0b2859971955f18d2cd)
#424. Removed duplicate logic to check if this processor supports the
config attribute.
(cherry picked from commit 350de8545cc5f6f55a68b0924d2bc1d933b6514c)
#424. Fixed an issue where a user may have gone to a secure page, and
then tried to go to a unsecured page.  They never go back to non-SSL.
The reason is that the line "!invocation.getHttpRequest().isSecure()"
returns false if the SSL terminated at the LB.  Now, in this case, we
need to key, first off of the X-Forwarded-Proto header to see if this is
SSL.  If so, we can redirect to non-ssl.
(cherry picked from commit 3501218f0a42103a547c534384f06302bf026981)
#747 : Don't split qualifiers if the offer does not contain qualifiers
Fixes #752 - Ensure that the ceiling entity is used to determine metadata if there are errors on the form when submitting a new entity
(cherry-picked from commit 4106f64b01057729547bf4cf5e517638b5949a21)
Fixes #750 - Ensure that the selectable field types for Solr fields match what is in the Solr schema.xml
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x

Conflicts:
	admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/web/controller/entity/AdminBasicEntityController.java
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/catalog/dao/ProductDaoImpl.java
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/offer/service/discount/domain/PromotableOrderItemPriceDetailImpl.java