Merge "base run.sh: simplify CONTROLLER_RUNSH definition"