Workaround new hostname behavior. Also bump timeout to 15 for consistency. [rharwood@redhat.com: rewrote commit message] Merges: #3