MAGETWO-80353: PHP 7.1 compatibility: Jenkins Failures related to PHP 7.1 upgrade

Author: danielrenaud

app/code/Magento/User/Model/ResourceModel/User/Collection.php

@@ -31,11 +31,11 @@ protected function _construct()
     protected function _initSelect()
     {
         parent::_initSelect();
-        $this->getSelect()->join(
+        $this->getSelect()->joinLeft(
             ['user_role' => $this->getTable('authorization_role')],
-            'main_table.user_id = user_role.user_id',
+            'main_table.user_id = user_role.user_id AND user_role.parent_id != 0',
             []
-        )->join(
+        )->joinLeft(
             ['detail_role' => $this->getTable('authorization_role')],
             'user_role.parent_id = detail_role.role_id',
             ['role_name']