Merge remote-tracking branch 'upstream/master' into splitrun

accumulo/pom.xml

aerospike/pom.xml

bin/ycsb

binding-parent/datastore-specific-descriptor/pom.xml

binding-parent/pom.xml

cassandra/pom.xml

...ra/src/main/java/com/yahoo/ycsb/db/CassandraClient10.java

...dra/src/main/java/com/yahoo/ycsb/db/CassandraClient7.java

...dra/src/main/java/com/yahoo/ycsb/db/CassandraClient8.java

cassandra2/pom.xml

...c/test/java/com/yahoo/ycsb/db/CassandraCQLClientTest.java

core/pom.xml

couchbase/pom.xml

couchbase2/README.md

couchbase2/pom.xml

...n/java/com/yahoo/ycsb/db/couchbase2/Couchbase2Client.java

.../main/java/com/yahoo/ycsb/db/couchbase2/package-info.java

distribution/pom.xml

dynamodb/pom.xml

elasticsearch/README.md