Improve fix of weird ubuntu python-virtualenv bug

Change-Id: I0f0cf2980d31424582267e7c8db7da22958536b1
diff --git a/src/com/mirantis/mk/Openstack.groovy b/src/com/mirantis/mk/Openstack.groovy
index ed0028c..8aa5690 100644
--- a/src/com/mirantis/mk/Openstack.groovy
+++ b/src/com/mirantis/mk/Openstack.groovy
@@ -27,6 +27,8 @@
     python.setupDocutilsVirtualenv(path)
 
     def openstack_kilo_packages = [
+        //XXX: hack to fix https://bugs.launchpad.net/ubuntu/+source/python-pip/+bug/1635463
+        'cliff==2.8',
         'python-cinderclient>=1.3.1,<1.4.0',
         'python-glanceclient>=0.19.0,<0.20.0',
         'python-heatclient>=0.6.0,<0.7.0',
@@ -43,6 +45,8 @@
     ]
 
     def openstack_latest_packages = [
+        //XXX: hack to fix https://bugs.launchpad.net/ubuntu/+source/python-pip/+bug/1635463
+        'cliff==2.8',
         'python-openstackclient',
         'python-heatclient',
         'docutils'