Merge pull request #1077 from elastic/confine_elasticsearch-user_providers
Fix more failing master tests