Merge branch 'develop', remote-tracking branch 'origin' into develop
Fix handling of unflattened map parameters in query services.  Part of the fix for https://github.com/aws/aws-cli/issues/407.
Add a botocore-specific test for updated handling of maps in query interfaces.
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'fix-awscli-407' of git://github.com/garnaat/botocore into garnaat-fix-awscli-407