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