This reverts commit f8d4db54.

Reason for revert: Zun was deprecated due to the hard dependency on old version of docker and etcd. Right now, the problem was fixed.

Change-Id: I9fe760e2b9b774b5ea623e6b305de004fc0c6dd2