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