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