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