Merge "Improve error handling in webapp /keys" into feature/zuulv3