Restrict python-cinderclient to <2 for now

Better be safe than sorry and restore the upper bound
on python-cinderclient. See https://review.openstack.org/#/c/30858/
for the discussion.

Change-Id: Ia82e2f0c04dd36092059bc04e8e07990ad41ff58