#669 : Make CMS properties available to non-servlet and servlet layer bean alike
Merge remote-tracking branch 'origin/BroadleafCommerce-3.0.x' into develop

Conflicts:
	admin/broadleaf-contentmanagement-module/src/main/resources/applicationContext-servlet-cms-contentCreator.xml
#669 : CMS Spring properties are not available to non-servlet layer beans