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