Merge "[DMaaP] Fix Ingress configuration"