Remove metadata/id from the representation

Pending discussion on its format
Merge pull request #3151 from cleishm/metadata_no_id

[2.1] Remove metadata/id from the representation
Merge branch '2.1-maint'