Merge "Update Mapper4 SetBadMetadata VTS test for optional metadata" into tm-dev