Merge pull request #20617 from nalind/journald-pkgconfig

Try to handle changing names for journal packages