- rpmlog: split joined sub-items separated by '-' onto new lines
- rpmgs: drop 'ours' merge strategy that broke merging vendored sources
- rpmlog: fix -n/-v not resetting release to <prefix>1