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