getServerURL(db, context) not including port number when returning the URL (virtual or main wiki)

When running with virtual wikis (though I'm sure this would happen with the main wiki as well), if you're running on a non-standard port (with or without SSL), the URL returned does not contain the port number, so that URLs constructed based on that URL will not work.