add non-jamm path for cached statements
patch by Michael Stepura; reviewed by jbellis for CASSANDRA-6293
merge from 1.2
Merge branch 'cassandra-2.0' into trunk