Set pub_hwm to 1000 by default, Fix #7211
Change pub_hwm default to 100 (should be enough)
Merge branch '0.17' of github.com:saltstack/salt into 0.17