Properly handle exceptions during native proto decode

Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-8118
Merge branch 'cassandra-2.1' into trunk
Fix 2i lookup on collection cell names w/ some clustering columns

Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-8073
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/filter/ExtendedFilter.java
Ninja: add missing @Override to new toString() methods
Merge branch 'cassandra-2.1' into trunk
Avoid NPE on null nested UDT inside a set

Patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-8105
Merge branch 'cassandra-2.1' into trunk