Eng 5112 consistent cli

See corresponding pull request in pro for run.sh changes only.