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