Merge pull request #8937 from vbatts/vbatts-mount_optional_fields

pkg/mount: include optional field