Fixes #1081 - Return resource names from the FileService to do things with the files after they have been added to the provider
Fixes #1082 - Hardcoding the default value for an integer system property to zero makes Broadleaf a sad panda
Merge branch 'BroadleafCommerce-3.1.x' into develop
#1084, #1085. Added hooks so that someone can add additional fields when
indexing.  Also added better support for property resolution for Maps,
Collections, and single dimension arrays.
#859. Added support for product options to be indexed in Solr, with a
convenience method to getProductOptionValuesMap(). This returns a map,
keyed by product option name, with a Set of Strings as values.
#1084.
#1086 - Add support for a lookup for update collection lookup type
#1088 - Add annotation param for production filtering
#1088 - Add annotation param for production filtering
(cherry picked from commit c9279bb)
Update milestone version
Parameterize the definition of the extension handler.
#1089. Deprecated HANDLED value.
#1089 - Update javadocs for ExtensionResultStatusType to be parsable javadocs
Merge remote-tracking branch 'origin/develop' into prod_sandbox
Update milestone version
Merge remote-tracking branch 'origin/prod_sandbox' into prod_sandbox_adv_bundle

Conflicts:
	admin/broadleaf-admin-functional-tests/pom.xml
	admin/broadleaf-admin-module/pom.xml
	admin/broadleaf-contentmanagement-module/pom.xml
	admin/broadleaf-open-admin-platform/pom.xml
	admin/pom.xml
	common/pom.xml
	core/broadleaf-framework-web/pom.xml
	core/broadleaf-framework/pom.xml
	core/broadleaf-profile-web/pom.xml
	core/broadleaf-profile/pom.xml
	core/pom.xml
	integration/pom.xml
	pom.xml
Update milestone version