Added commented out properties for convenience.
https://github.com/BroadleafCommerce/BroadleafCommerce/issues/819(cherry
picked from commit ab8c8474223b4595a329ef66d5c17e360b4e7c4f)

Conflicts:

	site/src/main/resources/runtime-properties/common.properties
Fixed misplaced comments in XML.(cherry picked from commit
10d8a96073e1e14e51fb78e97b1d8174ffabb192)

Conflicts:

	site/src/main/webapp/WEB-INF/applicationContext.xml
Updating demo site to align with changes for
https://github.com/BroadleafCommerce/BroadleafCommerce/issues/819(cherry
picked from commit e238dbec18173302795c60b78b05e894d09d46f5)

Conflicts:

	site/src/main/resources/runtime-properties/common.properties
	site/src/main/webapp/WEB-INF/applicationContext.xml
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x

Conflicts:
	site/src/main/webapp/WEB-INF/applicationContext.xml
Merge branch 'BroadleafCommerce-3.1.x' into develop
Merge branch 'develop' into sku_browsing

Conflicts:
	site/src/main/webapp/WEB-INF/applicationContext.xml