XX-11244:  Adding back etc and config plugin build