make sure c* returns the correct version when running inside an IDE (for cqlsh)
patch by dbrosius reviewed by jbellis for cassandra-5964
Merge branch 'cassandra-2.0' into trunk