Simplifies the Blick Comment code and fixes the issues with line comments as prefix of bock comments and equal block comments delimiters
Merge with master
Merge with master
Fixes after review
Merge remote-tracking branch 'origin/master' into tom/block-comment-improvements
Fixes after second review
Merge pull request #7135 from adobe/tom/block-comment-improvements

Block Comment Improvements/Fixes