Change etcDir to haAwareEtcDir