Merge "Re-enable test_file_jobs" into feature/zuulv3