Issue #2183231 followup: Convert PSR-0 code to PSR-4 in custom_block module.