fixes #1190 - by default SystemSupportLoggerAdapter should only emily SUPPORT level logs.
Merge pull request #1192 from smmckay/develop

Fixes #1192 - Prevent NPE from Java 8 lambdas
Merge branch 'BroadleafCommerce-3.1.x' into develop
Fix MergeManager overrides

Properties.keySet() doesn't take default properties into account, so if an override is used then the contents of default.properties is effectively ignored.