If you apply a module, remove it and then apply it again it would
no longer show up in the module-query command. This has been fixed
and corresponding tests added to the module scenario run.
Also added missing 'object' to ModuleManager class
Change-Id: I3302a2547cf88f1da1ba4abca6617981572782d4
Closes-Bug: #1571799