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