Cleanup _oc_webroot stubs where possible
#5378
Merged
_oc_webroot stubs where possible
#5378