Moving the CLI-specific stuff over to awscli.  There is another PR over there corresponding to this one.