Merge "Enable test_post_checkout" into feature/zuulv3