[automerger skipped] Merge "Disable testEnableRollbackTimeoutFailsRollback test." into qt-dev am: 4dd2a01430 am: ef944458e3
am: 7c53fa5409 -s ours
am skip reason: change_id I01f3e769711ffa51fa714ff4bc81e70887f427ad with SHA1 798b859b2b is in history

Change-Id: I2ec5914648d0c8eec30efd81ee5ac2f68c4fa6e9