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