Upgrade to airlift 0.85 and discovery-server 1.17
Move commons-logging exclusion to root POM
Bundle tpch and cassandra plugins with server