Merge from waqas

diff --cc core/modulemanager.lua
index 65ab3e1a8def056fc2e75a9b0001326fe396358e,1382e227d6be5ef46d826aba2c2b14ed68451c03..3c27e7a05ced771bd935201f0a2f58cca2b1b9ac
--- 1/core/modulemanager.lua
--- 2/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@@ -44,12 -44,10 +44,10 @@@ module "modulemanager
  
  local api = {}; -- Module API container
  
 -local modulemap = {};
 +local modulemap = { ["*"] = {} };
  
- local m_handler_info = multitable_new();
- local m_stanza_handlers = multitable_new();
+ local stanza_handlers = multitable_new();
  local handler_info = {};
- local stanza_handlers = {};
  
  local modulehelpers = setmetatable({}, { __index = _G });