cqlsh: Handle collections embedded into UDTs correctly.

patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7267
Merge branch 'cassandra-2.1' into trunk