Fix for VUFIND-1002.
Merge branch 'release-2.3'
VUFIND-1004
VUFIND-1004