Merge "Use system level for etcd instead of service"