Update to Hibernate 3.6.1 and necessary changes

Includes update to EhCache 2 as used by Hibernate 3.6+