Merge pull request #2653 from jwhonce/wip/documentation

WIP Cartridge Refactor - Updated Guide
Bug 967118 - Immutable files in cartridges

* Fix exception failure bug
* Fix generating file list