Remove time penalty from DES.
Patch by Tyler Hobbs, reviewed by brandonwilliams for CASSANDRA-6465
Merge branch 'cassandra-2.0' into trunk
Don't shutdown a nonexistant native server on 1.2, either.
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk