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