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