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