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