Merge with Link Mauve

diff --combined plugins/muc/mod_muc.lua
index 354ab1d144ed00bf38e1765a397c6296fa01071d,7ecd649051974b843f8ea710b90174706fa82d2a..c8723c162f8a0d198ef0bf2417d5171e76157b3f
--- 1/plugins/muc/mod_muc.lua
--- 2/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@@ -7,7 -7,7 +7,7 @@@
  --
  
  if module:get_host_type() ~= "component" then
-       error("MUC should be loaded as a component, please see http://prosody.im/doc/components", 0);
+       error("MUC should be loaded as a component, please see https://prosody.im/doc/components", 0);
  end
  
  local muclib = module:require "muc";
@@@ -102,7 -102,11 +102,7 @@@ local function room_save(room, forced
        local is_persistent = persistent.get(room);
        persistent_rooms:set(nil, room.jid, is_persistent);
        if is_persistent then
 -              local data = {
 -                      jid = room.jid;
 -                      _data = room._data;
 -                      _affiliations = room._affiliations;
 -              };
 +              local data = room:freeze();
                room_configs:set(node, data);
        elseif forced then
                room_configs:set(node, nil);