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