Improve error handling in UI test conflict dialog detection
Improve error handling in UI test conflict dialog detection

owncloud/core,owncloud/core,owncloud/core,owncloud/core,owncloud/core,phil-davis/core