Issues overriding out-of-box beans

The Bean loading sequence (order) that Spring uses can sometime be unpredictable. The intent is to sequence the configuration merge from the framework configuration, to all the modules, and then finally to the local project overrides.  However, there are cases that Spring will merge in the project overrides too soon and they get reset when the modules get merged. We've added in a special override mechanism to force a "last step" merge from Spring. To introduce this process, do the following:

1) In your local project (admin, site, and/or core) create a new java package called "org.broadleafoverrides.config"
2) In that package, create a new Java @Configuration class - you can call the class whatever make the most sense for your needs
3) Move the @Bean and/or @Merge configurations over to this new Java Config class

This new package should be the last one to participate in the configuration merge process.