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