Merge "Fix issue where getting empty consul in discovery"