ITS#9347 invalid policy handling
The second commit is a behaviour change and that's why the tests fail. I have no opinion whether that change should be made yet, so haven't adapted it so far. After we decide, I'll either drop that commit or adapt test022.