Spring shortcuts

Spring XML cleanup

https://www.pivotaltracker.com/story/show/61240064