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