Fix repair -pr for vnodes; patched by yukim reviewed by driftx for CASSANDRA-5329
Merge branch 'cassandra-1.2' into trunk