Merge "Remove python-novaclient from requirements.txt"