Fix the InvertedIndex trigger example

patch by Anthony Cozzie; reviewed by Aleksey Yeschenko for CASSANDRA-7211
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	examples/triggers/src/org/apache/cassandra/triggers/InvertedIndex.java
Merge branch 'cassandra-2.1' into trunk