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