Merge "Change novaclient usage"