Improve zap feedback messages

In particular, note explicitly when no `zap` stanza is present.
Merge pull request #6207 from rolandwalker/improve_zap_messages

Improve zap feedback messages