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