Bug 1025322 - gaia-try: do a merge locally instead of using the pull request reference r=aki