Reverted GORA-206 and fixed GORA-223
Fixed dependences (cassandra-all is a compile dependence too, not only
test)