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