Pulled some @Transactional and Javadoc fixes over from Hibernate upgrade
branch to prepare for SessionFactory changes.