Merge changes I8f95f3f8,Ic2e384ad into nyc-dev

* changes:
  Add generation of a module-info.json file
  Remove unused module-info.txt generation.