Removed persist_xxx parameter references from cli/hanlon policy