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

Change-Id: Icedd678266fc505d4545865b3431f5606f8f73ad