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