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