Apply pegasus-config fix from master
Merge branch '4.3'

Conflicts:
	bin/pegasus-config