Merge "Rename ssh_port to connection_port" into feature/zuulv3