do not ignore user configured JAVA_HOME

Patch by eevans; reviewed by Michael Shuler for CASSANDRA-6131
Move *PropDefs to o.a.c.cql3.statements
Merge branch 'cassandra-2.0' into trunk