Issue #4948 - add state_output argument to allow override of value configured in master
Merge pull request #6354 from jslatts/issue_4948_output_state

Issue #4948 - add state_output argument to allow override of value configured in master