small fixes on nephoscale due to driver refactoring
Merge branch 'master' into softlayer