Merge pull request #16709 from MHBauer/daemon-derepo2

continue daemon refactor of Repositories()