Merge "Make ENABLE_ROLLBACK_TIMEOUT configurable"