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