nephoscale driver refactoring issues
Merge branch 'master' into softlayer