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