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