Simplified enabled blocks and layouts settings computation
Merge branch 'ezpage_readonly2' of git://github.com/ezsystems/ezpublish-kernel into ezpage_readonly2