[525] command_executed, command after token substitution
Merge pull request #540 from portertech/525

[525] command_executed, command after token substitution