Issue 1586 multiple default hosts

Has a matching enterprise branch that needs pulled also