Updated JC-1388:
-added measurement for dao and transactional service
-revert database.properties