More hostname handling fixes

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>