Merge "Enable maintainConnectionCache" into feature/zuulv3