Do not render block if module isn't active.
Add bundle to Kernel when it's going to be updated.
Merge pull request #1906 from cmfcmf/bootstrap-fixes

Kernel / Bundle fixes