Fix a small bug with server metrics parsing + a few code cleanups.#2465

chernser merged 3 commits intoClickHouse:mainClickHouse/clickhouse-java:mainfrom

avshenuk:mainavshenuk/clickhouse-java:mainCopy head branch name to clipboard