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