Spring 4.1 upgrade
Merge pull request #717 from Unicon/spring-41-upgrade

Spring 4.1 upgrade