Signed-off-by: NJames Myatt <james@jamesmyatt.co.uk>

# Conflicts:
#	ChangeLog.txt
#	src/paho/mqtt/client.py
#	src/paho/mqtt/publish.py
#	test/lib/Makefile
#	test/lib/context.py
#	test/lib/python/01-zero-length-clientid.test
#	test/lib/python/08-ssl-connect-cert-auth.test
#	test/lib/python/08-ssl-connect-no-auth.test
#	test/lib/python/08-ssl-fake-cacert.test
#	test/paho_test.py