Add schema_triggers cleanup to SystemKeyspace#finishStartup()
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/SystemKeyspace.java
Add schema_usertypes cleanup to SystemKeyspace#finishStartup()
Merge branch 'cassandra-2.1' into trunk