clean up the last of extension stuff in novaclient
Merge pull request #15494 from basepi/bp-15340

Backport #15340 to 2014.7