Merge branch 'master' of git@git.opensuse.org:projects/zypp/sat-solver