Generate ssl cert earlier and add join field
Improve the AMI
Merge atnnn/ami into next

Review 730 by @mlucy

Issue #892