[BUGFIX] Fix security-related unit test failures
[BUGFIX] Fix security-related unit test failures

The change I724c1b352dd1807ba53b1e336f2d90e90360ff4d introduced some
test failures. This change takes care of the failing unit tests.

Change-Id: Idff32284a4e8c4e935b7d7c132da769f5dd47140
Related: #42601
Releases: master
Original-Commit-Hash: 9a3433d938110b57052d2a6bce81963368d7eeb2

dfeyer/flow-development-collection,chewbakartik/flow-development-collection,kitsunet/flow-development-collection,bwaidelich/flow-development-collection,fcool/flow-development-collection,dfeyer/flow-development-collection,robertlemke/flow-development-collection,aertmann/flow-development-collection,daniellienert/flow-development-collection,gerhard-boden/flow-development-collection,mkeitsch/flow-development-collection,dlubitz/flow-development-collection,kdambekalns/flow-development-collection,robertlemke/flow-development-collection,robertlemke/flow-development-collection,albe/flow-development-collection,albe/flow-development-collection,chewbakartik/flow-development-collection,mkeitsch/flow-development-collection,dfeyer/flow-development-collection,dlubitz/flow-development-collection,gerhard-boden/flow-development-collection,daniellienert/flow-development-collection,fcool/flow-development-collection,kitsunet/flow-development-collection,gerhard-boden/flow-development-collection,aertmann/flow-development-collection,kdambekalns/flow-development-collection,fcool/flow-development-collection,aertmann/flow-development-collection,albe/flow-development-collection,bwaidelich/flow-development-collection,dlubitz/flow-development-collection,neos/flow-development-collection,kitsunet/flow-development-collection,bwaidelich/flow-development-collection,neos/flow-development-collection,chewbakartik/flow-development-collection,kdambekalns/flow-development-collection,dfeyer/flow-development-collection,robertlemke/flow-development-collection,kdambekalns/flow-development-collection,fcool/flow-development-collection,neos/flow-development-collection,mkeitsch/flow-development-collection,daniellienert/flow-development-collection,neos/flow-development-collection