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