Expose 2I to the rest of nodetool
Patch by Jason Brown, reviewed by brandonwilliams for CASSANDRA-4464
Merge branch 'cassandra-1.2' into trunk