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