* Fixed http override port

* Cleanup references used for establishing tunnels

* Removed short flag from authentication-key-request-url