fix npe when specifying -Dcassandra.fd_initial_value_ms

patch by dbrosius reviewed by bwilliams for cassandra 6751
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1