#691 Changes to better support demo site provisioning.
https://github.com/BroadleafCommerce/DemoSitePrivate/issues/42