Move cli_name over to argrename customization

Also fix #760 by aliasing the query argument to objects-query,
which is consistent with how other shadowed args are renamed.

This is just updates to the configuration dict, but if we feel that
we should also have tests for the configuration I can add them.

This is intended to go together with: https://github.com/boto/botocore/pull/278