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