More targeted parameter stripping.
- Resolves VUFIND-1020.
Merge branch 'release-2.3'