Merge "skip test_server_cfn_init as the failure rate is too high"