Merge "Added support for /modules, /modules/module, /operations resources"