Merge pull request #6768
9f5c641 zmq: update docs to reflect feature is compiled in automatically if possible (Johnathan Corgan)