Set the default HWM to 1000

This is as suggested in the ZMQ documentation:
http://zguide.zeromq.org/page:all#High-Water-Marks
Merge pull request #8804 from basepi/hwm

Set the default HWM to 1000
Merge pull request #8805 from UtahDave/develop

Add hard return to make pylint happy
Don't define __opts__ and __pillar__ in the module

Also shorten a line