Merge "rename k8s-pgaas*.yaml to k8s-pgaas*.yaml-template"