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