Updated to support broker cluster virtual hostname