Merge "Fixing name of edgecore.yml k8s config file"