Merge "Update config cache only after all cat jobs complete" into feature/zuulv3