improved compatibility with different versions of novaclient
Merge pull request #16216 from grischa/2014.7-novafix

improved compatibility with different versions of novaclient