Merge "Make test_server_cfn_init a scenario test"