Merge "Removing AAF references from Cert-Service in OOM repo. Certificates regenerate...