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