Merge "Add python-cinderclient to requirements.txt"