Add extra cast so javac 1.8 can figure out what's going on
Trivial: whitespace changes
Update spring framework and javassist versions to deal with java 8