Extracted two versions of functions from handle_cert_persistence
Extracted two versions of functions from handle_cert_persistence

AVSystem/avs_commons,AVSystem/avs_commons,AVSystem/avs_commons,AVSystem/avs_commons