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