Merge "Do not remove uninstalled packages from journal" into oc-mr1-dev