Merge "Removing master branch from Cert-Service located in AAF repo"