Merge "Re-enable test_file_head test" into feature/zuulv3