Optimize FD phi calculation
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-6386
merge from 1.2
Merge branch 'cassandra-2.0' into trunk