Revert adding the key alias to the 2ndary indexes names (from 5378 patch)
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java