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