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