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