add tmp flag to Descriptor hashcode
patch by Boris Yen; reviewed by jbellis for CASSANDRA-4021
Merge branch 'cassandra-1.2' into trunk