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