Revert "Removed transaction template from Collectd so I can try and get declarative"

This reverts commit 769c5de00a403fd0f893cc8000bdf3e032207c95.
Undid a change from commit da3e405fcc8a15077f10956e532880e608ce00cb where the
TransactionTemplate was removed from CollectdIntegrationTest.
Updated some new code to Hibernate 4.
Added TransactionTemplate around geocoder initialization.
Cleaned up FilterFavoriteServiceTest to work with Hibernate 4.