[Bug 589] New - ETCDIR environment var needed and other changes