Merge branch 'feature/ZEN-13131-4' into develop
temp commit
twisted nova api client
remove unused try/except
Merge pull request #32 from zenoss/feature/ZEN-13132

Feature/zen 13132