Fixes #4165 #2056

Job	Run time
build-all	3m 14s
tests (scylla, -Pscylla-murmur -Dtest="*/diskstorage/cql/", murmur-diskstorage-java8, 8)	14m 47s
tests (scylla, -Pscylla-murmur -Dtest="*/graphdb/cql/", murmur-graphdb-java8, 8)	57m 28s
tests (scylla, -Pscylla-murmur -Dtest="*/hadoop/", murmur-hadoop-java8, 8)	11m 51s
tests (scylla, -Pscylla-murmur -Dtest="*/core/cql/", murmur-core-java8, 8)	4m 9s
tests (scylla, -Pscylla-murmur -Dtest="*/diskstorage/cql/", murmur-diskstorage, -Pjava-11, 11)	55m 12s
tests (scylla, -Pscylla-murmur -Dtest="*/graphdb/cql/", murmur-graphdb, -Pjava-11, 11)	56m 54s
tests (scylla, -Pscylla-murmur -Dtest="*/hadoop/", murmur-hadoop, -Pjava-11, 11)	11m 59s
tests (scylla, -Pscylla-murmur -Dtest="*/core/cql/", murmur-core, -Pjava-11, 11)	4m 12s
	3h 39m 46s

Provide feedback