Merge "Add test caller to test_server_cfn_init timeout error message"