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