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