Catch up to the latest version of Spring and removed misc compiler
warning errors