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