global: master to next integration

* Provides changes need after inveniosoftware/invenio#1765 is merged.