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