Limit user types to the keyspace they are defined in

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6643
Merge branch 'cassandra-2.1' into trunk