Fix tests by making QP use its own executor
Merge branch 'cassandra-2.1' into trunk