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