AAI 1.1 K8s templates and aelm branch merge