Merge pull request #343 from bkng/develop

Evaluation services improvements (PLFM-1770, 1774, 1775)
PLFM-1648: save entity + file handle + annotations with Submission