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