Reworked #2039 to add EC2 discovery to -retry-join along with restructuring the config and adding multiple auth methods. There's still some question of what to do about CI for the integration test ...