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

Addresses issue #4579