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