Merging in a fix from master
Ensure client.admin key before everything else
Ensure client.admin before osd creation

This is a bugfix merged from feature branch