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