Updated the spring configuration to work better with packages that want to contribute to the spring application context