winp
Merge branch 'client-3.1.2-mu2' of https://github.com/WaltHP/python-3parclient into client-3.1.2-mu2

Conflicts:
	test/test_HP3ParClient_base.py
wip
Merge branch 'client-3.1.2-mu2' of https://github.com/WaltHP/python-3parclient into client-3.1.2-mu2

Conflicts:
	test/test_HP3ParClient_base.py
WIP
Merge branch 'client-3.1.2-mu2' of https://github.com/WaltHP/python-3parclient into client-3.1.2-mu2

Conflicts:
	test/test_HP3ParClient_base.py
wip
Merge branch 'client-3.1.2-mu2' of https://github.com/WaltHP/python-3parclient into client-3.1.2-mu2

Conflicts:
	test/test_HP3ParMockServer_flask.py