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