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