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