Provide canonical host names for special-case machines.
Merge branch 'test' into staging