Delay v2 key generation until first boot

Follow up to #945 

cc @kbrock 

Thanks @Fryguy and @brandondunne for fixing my bugs ;-)
:+1: