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