Merge "Bug 1810990: blocktypes: all - block titles to be semantic, corrected titles to have uppercase"