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

Change-Id: I2717856a921b24f988c8fbe9579ce00966729578