Fixes null token getting passed to Bootstapper; Correctly includes new nodes in src-target calculation. patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-501