Fix bug 991387: Don't allow erase of carts in the cart_base_path
Adding description for Categories and Group-Overrides
Merge pull request #4071 from abhgupta/abhgupta-dev

Adding description for categories in the cartridge developer guide
Merge pull request #4110 from pmorie/bugs/991387

Merged by openshift-bot
Merge pull request #4114 from danmcp/master

Merged by openshift-bot