Issue #2315333 by tim.plunkett: Move block plugin code out of block.module.