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