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