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