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