Merge "cutils: str_parms: when deleting entry, need to also remove key"