Backport #15165 to 2014.7

Backport #15165 to 2014.7
Yeah, it is to some degree at least. I compared two versions of novaclient, the default distribution one and the github one and this stays the same while the location of the HookableMixin changed.
Pull request here: https://github.com/saltstack/salt/pull/16216
Cheers