Revert update of spring, should be update later. Keep fileupload update due to vulnerability on the previous version.
Merge remote-tracking branch 'origin/master'