ISPN-4516 Upgrade to Spring 3.2.9 and ISPN 7, enabled tests, remove unused code
ISPN-4543 Formatting
Delete unused file