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