Merge "Serve public keys through webapp" into feature/zuulv3