Merge branch 'OLINGO-709-InjectODataServiceFactory'