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