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