Merge "Fix NPE when getting Consul configuration"