fix key fetch for nephoscale create machine
Merge branch 'master' into keys_refactoring