using @Scheduled annotation to have a transaction timeout mechanism
added timeout mechanism for transactions and integration test
added commit and rollback methods
added retry mechanism for timeouts
updated tests to work with changes on master