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