Simplify by standardising on URI for server and login details; use common utility method

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/net/trunk@1586909 13f79535-47bb-0310-9956-ffa450edef68