Bug 1006476 - expecting a conflict on fast-forward +autoland