Merge "Disable testEnableRollbackTimeoutFailsRollback test." into qt-dev am: 4dd2a01430
am: f3bf426393

Change-Id: Ie86e20cdc6d7aec4b72ea605aad8dfe2d8c3215e