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