add option to hide container block types
fix tests
Merge remote-tracking branch 'sonata-project/master'