fix(app-admin/etcd*): fixups to get these building

Minor fixups to the packaging to get everything working on these.