Fix both sides of provide/conflict handling to work the same way

thus fixing conflicts-on-properties-rather-than-names, thus fixing the
last remaining unpassed test

.gitignore

*.o

*~

*.repo

razor

test-driver

pkgs

set

primary.xml.gz

filelists.xml.gz