Spring 3.2

Using a pull request to review this whole merge and pick up whitespace / Hibernate changes that should be fixed. Namely, the original changes from text to long strings should be converted to materialized_clob and tested across databases.