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