Resolved merge conflicts with master

modpol_core/orgs/base.lua

@@ -76,6 +76,8 @@ end
 --- Deletes all orgs except for the 
 -- @function modpol.orgs.reset
 function modpol.orgs.reset()
+   local instance_members =
+      modpol.util.copy_table(modpol.instance.members)
     for id, org in ipairs(modpol.orgs.array) do
         if id > 1 then
             modpol.orgs.array[id] = "removed"
@@ -84,9 +86,9 @@ function modpol.orgs.reset()
 
     modpol.orgs.array[1] = nil
     modpol.instance = modpol.orgs.init_instance()
-    
+    modpol.instance.members = instance_members
 
-    modpol.ocutil.log('Reset all orgs')
+    modpol.ocutil.log('All orgs reset')
     modpol.orgs:record('Resetting all orgs', 'org_reset')
 end