Merge "[AAI] Update Service definitions to support Ingress case"