Rollback storage transaction if execution time > database service response timeout.

Before the switchboard was timing out but the MRY transaction wasn't rolled back which produced inconsistencies between the transaction log and the database.
Updated magic numbers use to compute transaction timeout
Merge pull request #94 from wajam/manu-rollback-timeout

Rollback storage transaction if execution time > database service response timeout