Don't allow simultaneous bootstrap when cassandra.consistent.rangemovement is true

Patch by brandonwilliams, reviewed by tjake for CASSANDRA-7069
Merge branch 'cassandra-2.1' into trunk