Streamling key verification and server host denomination

Job #11535 failed for e85eec34:

Some servers have two hostnames, which leads to failed ssh key verification and double-installs, for example with APT that fails because the lock is held by an already running process. It's not critical but would be nice to fix to get the little green dopamine check.