Merge "Re-enable test_json_status" into feature/zuulv3