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