If branch automerge *previously* failed, then still make sure we are keeping the PR up to date. Closes #1336