Allow composing collection name from metadata

- Discovered during testing that self relational links were not being marshaled
  from metadata; fixed that situation to ensure tests would pass.
Merge branch 'feature/collection-name'

Allow composing the collection name in the metadata map.