Merge pull request #376 from bkng/develop

PLFM-1648: persist FileHandle IDs with Submission objects
PLFM-1648: Code review changes