[automerger skipped] Merge "Disable testEnableRollbackTimeoutFailsRollback test." into qt-dev am: 4dd2a014 am: f3bf4263
am: 161babb0 -s ours
am skip reason: change_id I01f3e769711ffa51fa714ff4bc81e70887f427ad with SHA1 798b859b is in history
Change-Id: Ifc47b024b5ecd24766c741598ec8808c3e87790b