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