Bug 838351: stop nodes complaining about package conflicts; a=nodechange