SWC-346: refactor Entity editor dialog and form into MVP.  And set attachment name on image file name