[DDC-2661] Fix bug in YamlDriver not passing options from id to mapField()
Merge branch 'DDC-2661' into 2.4