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

Change-Id: Ia687f64cf6a26d414d8f106d4093b08ba980d173