Merge branch 'btallman'

Conflicts:
	volos-connectors-common/lib/serverBase.js