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