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