Merge pull request #685 from Megala21/test_case_fixes

Fixes https://github.com/wso2/product-iots/issues/346

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/UserManagementServiceImpl.java

@@ -238,6 +238,7 @@ public class UserManagementServiceImpl implements UserManagementService {
                 }
             }
             rolesToDelete.remove(ROLE_EVERYONE);
+            rolesToAdd.remove(ROLE_EVERYONE);
             userStoreManager.updateRoleListOfUser(username,
                                                   rolesToDelete.toArray(new String[rolesToDelete.size()]),
                                                   rolesToAdd.toArray(new String[rolesToAdd.size()]));