Chasing head: Issue #2315333 Move block plugin code out of block.module