Merge "Fixing missing apiVersion in etcd chart" into elalto