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