Fix build warnings
Update JavaDoc
Merge in changes to web utils from Spring 4.1