Refactor contextual hostname code to be less confusing
Refactor contextual hostname code to be less confusing

wcmitchell/insights-core,PaulWay/insights-core,wcmitchell/insights-core,PaulWay/insights-core