Cleanup sweep#39

NickSdot wants to merge 14 commits into

php:mainphp/docbook-cs:mainfrom

NickSdot:stack-08-cleanupNickSdot/php__docbook-cs:stack-08-cleanupCopy head branch name to clipboard