Merge pull request #369 from bkng/develop

PLFM-1648: save EntityBundle with Submission objects
PLFM-1648: Refactor EntityBundle serialization to SubmissionManager