Merge "Catch integration key file not found in zuul" into feature/zuulv3