Merge "upstream-diff tool: improve help text for command line parameters."