Bump mockito to 2.27.0 and fix up merge conflict
Bump mockito to 2.27.0 and fix up merge conflict

Signed-off-by: Unpublished <6f140c02b5c9b12588d158ba2a71b971bf469908@gmx.net>

David-Development/ownCloud-Account-Importer