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