Merge pull request #775 from mrvisser/scrub-acceptedtc

Scrub acceptedTC, fix intermittent test failure
(Issue 696) Migrate queries to CQL3