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