handle more complex attributes for cscc

@bug W-1818137@
@rev fabbott@
Merging origin/bob/master-pending/handle-complex-attributes into master