* extract consul client builder to distinct bean rather than static instantiation to allow injection of custom clients * use supplier to allow new builder to be instantiated every call * rename variable * re-order imports to resolve checkstyle issues * fix compilation issues