Fix doc bug for shorthand syntax

For list of structure/scalars, don't assume it's one inner list type and
one scalar type.  There could be any number of those inner types, so we
need to account for this accordingly.

Signed-off-by: Mitch Garnaat <mitch@garnaat.com>
Merge branch 'develop' of github.com:aws/aws-cli into develop