Refactor `ContentBlockController::save()`

Refactor `ContentBlockController::save()` to account for possible
overrides. Also account for future additions to code.
Merge pull request #1047 from mkly/refactor_content_block_controller_save

Refactor `ContentBlockController::save()`