Merge "Add ability to define packageFiles in extension.json"