Merge "Re-enable test_abandoned_not_timer" into feature/zuulv3