refs #7090. Solve merge conflict.
refs #7090. Fix input issue.
Merge remote-tracking branch 'origin/feature/7090_runpythonscript'