Merge "Enable test_post_and_master_checkout" into feature/zuulv3