Merge in web client additions and changes from Spring 3.2