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