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