cqlsh: Fix UDT field selection

Patch by Philip Thompson; reviewed by Tyler Hobbs for CASSANDRA-7891
Merge branch 'cassandra-2.1' into trunk