Merge "encrypt_secret: remove the trailing '/' when building url" into feature/zuulv3