merge master to cassandra-cluster-support
merge master to cassandra-cluster-support

legdba/servicebox-jaxrs,legdba/servicebox,legdba/servicebox,legdba/servicebox,legdba/servicebox-jaxrs,legdba/servicebox-jaxrs,legdba/servicebox,legdba/servicebox-jaxrs,legdba/servicebox-jaxrs,legdba/servicebox