Merge with branch hibernate3.6.10.Final. Added Paging/Caching to OnmsDaoContainer. Switched to Hibernate3.6.10.Final