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