Bring into line with master commit 827a43b3.

In ODWY0350, this patch adds the synonym "VELVET" for "PILLOW".

In ODWY0440, this patch adds support for "H2O PLANT", and
implements the vocabulary matching to reject "NORTHWEST"
instead of treating it as a synonym for "NORTH".