Merge pull request #2906 from raydavis/raywip

CLC-4006 Fix block messages for codes with leading zero
CLC-3031 Add a word to the Double Major block message