Delay v2 key generation until first boot

Follow up to #945 

cc @kbrock 

Thanks @Fryguy and @brandondunne for fixing my bugs ;-)
I like having it separate.
I would like to get ssl key generation into here as well.