fix Issue 6889 - "finally" mentioned in a compilation error, instead of "scope(exit)" or "scope(success)"
fix Issue 2456 - "cannot put catch statement inside finally block", missing line number
Remove workaround for issue 11939
Merge pull request #3564 from 9rnsr/fix_onscope

Issue  6889 & 2456 - Fix diagnostic messages for OnScomeStatement