PLFM-1859: Handle null entity bundle in submissionDAO

Merged from release-1.23