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