This is inherited from #792... core PAPI configuration will not use storage repositories as added in #736, so this is done in order to be able to build MVC configuration on top of core PAPI configuration.