Merge "remove getSourceByHostname" into feature/zuulv3