Update the entity reference and OG-vocab modules

Relate to issue #1420