webkitpy: Small changes to merging script

Small changes to allow the merging script to work in the buildbot
environment.

BUG=524758

Review-Url: https://codereview.chromium.org/2759913002
Cr-Commit-Position: refs/heads/master@{#458395}
4 files changed