Highstate output improvements

This PR introduces the proposed highstate improvements proposed in issue #11198.