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