control java version by properties, proper cleanup for Spring related tests, fix for Spring 4.x

Bill,
prepared against commit 9267de95a92e62d2c82d24c09d9254a3f97d995d (Merge pull request #447 from psakar/Branch_2_3). Sorry for the previous PR, I've forget to fetch from upstream
Petr