Ensure policy validated marker files are generated.

Close #2659, #2694
Merge pull request #705 from sigurdteigen/master

Ensure policy marker files are generated