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