Bug 6874: [QA Follow-up] Adjustments for opac-retrieve