[Bug 589] ETCDIR environment var needed and other changes