RFR: Fix git issues with merge bot

[Erik Helin]

Hi all,

please review this small patch that fixes a few issues with how the merge bot
interacts with git.

Thanks,
Erik

-------------

Commits:
 - 8eec5424: Fix git issues with merge bot

Changes: https://git.openjdk.java.net/skara/pull/399/files
 Webrev: https://webrevs.openjdk.java.net/skara/399/webrev.00
  Stats: 14 lines in 1 file changed: 11 ins; 0 del; 3 mod
  Patch: https://git.openjdk.java.net/skara/pull/399.diff
  Fetch: git fetch https://git.openjdk.java.net/skara pull/399/head:pull/399

PR: https://git.openjdk.java.net/skara/pull/399