Add cinderclient
Fix provides/conflicts for clients (python2 not openstack)
Also fixed conflict/provides for novaclient
Fixed dependencies to include client git packages