Merge "Do not add 80,443 ports to dashboard url"