Fix (some) 2i on composite components omissions

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5851
Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk