#370454 follow-up by chx: Enhance comments to page cache simplification patch, and add in missing settings.default.php hunk.