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