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