Merge branch '3.2.x' into cleanup-3.2.x
Merge branch '3.2.x' into cleanup-3.2.x

* 3.2.x:
  Polish documentation in Hibernate support classes
  Improve 3.2 migration guide re: JUnit & Hamcrest
Polish formatting

Minor formatting polish across that codebase. Primarily fixing
whitespace issues.
Merge branch 'cleanup-3.2.x' into 3.2.x

* cleanup-3.2.x:
  Polish formatting