Tests were broken by a change in the nock package.  This fixes the issue by trimming the path from any hosts passed to nock.
Merge branch 'dev' into cert_auth

Conflicts:
	test/util/util.js