Merge pull request #3323 from jwhonce/bug/903106

Merged by openshift-bot
Include PEPs in doc builds
Merge pull request #3316 from nhr/include_peps

Include PEPs in doc builds
Bug 995233 - Use oo_spawn in place of systemu

* Clean up quota interface to return results as hash