071322
Merge branch 'nginx-ng' into 'production' Migrate nginx.ng to nginx, update nginx formula pillars See merge request infra/salt!1222