Fix path for local to always be first.

Conflicts:
	common-environment