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