Don't allow mixed multi/single column relations

Patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-7711
Merge branch 'cassandra-2.0' into cassandra-2.1.0