fix diff executable assumptions for PUP-2073
Merge branch 'fix/master/multiple_diff_args_test' into fix/master/multiple_diff_args