Updates for new container
Merge branch 'master' of https://github.com/encorephp/kernel