descriptiveKeywords template should look up schema using $schema instead of
hard coded iso19139
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x