This removes the usage of Hostname() which does not honor configured SSH port to be used. Resolves: #1377 See also: #1101, #1102 Signed-off-by: Tobias Jakobsson <jakobsson.tobias@gmail.com>