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