Merge "jiri: Rename -remotebranch to -remote-branch for consistency."