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