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