remove lines in setup.py which modify PYTHONPATH; move a copy of six.py to the top level of openstack zenpack.
use openstack api clients that are compatible to six 1.1.0
Merge branch 'feature/2.0.0dev' of https://github.com/zenoss/ZenPacks.zenoss.OpenStack into feature/2.0.0dev