Only modify the cli_name attribute of parameters that conflict with awscli standard parameters, not the py_name.  This means botocore will not be affected by these mods.
Merge branch 'develop' of github.com:boto/botocore into develop