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