Maint 1.1

@jalavik, @jirikuncar, @kaplun: Backports fixes for OAI related to issue #2300 from invenio/master to maint-1.1. cf. pr #2601