Fix requests with skipMetadata=false returning no metadata

patch by slebresne; reviewed by thobbs for CASSANDRA-8054
Merge branch 'cassandra-2.1' into trunk

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