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