Serialize s3 metadata properly
Add support for parsing S3 metadata types

A special case is required to parsed rest-xml, map types
with a location of header.  The only place this is used is for
S3 metadata types.
Merge branch 's3-metadata' into develop

* s3-metadata:
  Add support for parsing S3 metadata types
  Serialize s3 metadata properly