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