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