Fix handling of unflattened map parameters in query services.

  Part of the fix for https://github.com/aws/aws-cli/issues/407.