Update CDB code from upstream (mediawiki core)

Minor refactoring to add cdb folder

Bug: 73454
Change-Id: I74e53c825a553523a8830f2470c00f448d5aea3a