Fix minor issue with specifying the table name in query.
Make Cms_Html::content_block_parse_params public.
Merge remote-tracking branch 'origin/master'