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