Merge "Changed the config loading from consul"