SWC-968 - fix non-file entity name/markdown editing
Merge pull request #629 from dburdick/release-17

SWC-968 - fix non-file entity name/markdown editing