Fix potential loss of 2ndary index entry during compaction

patch by slebresne; reviewed by beobal for CASSANDRA-6517
unify test timeouts, exclude pig
Merge branch 'cassandra-1.2' into cassandra-2.0
exclude pig from test target
Merge branch 'cassandra-1.2' into cassandra-2.0
Fix CounterContext.ContextState.copyTo() method
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	build.xml
	src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
	src/java/org/apache/cassandra/db/context/CounterContext.java
	test/unit/org/apache/cassandra/db/RangeTombstoneTest.java