Fix to retain and pass args

The --user-data-dir check routine shifts and removes the args. This edit is to retain the original arguments and pass to executable when finally called.
See issue #15435