Feature/nginx ensure locale stays visible in uri path

Feature/nginx ensure locale stays visible in uri path #2417