Merge remote-tracking branch 'tower/release_3.3.0' into devel

installer/roles/image_build/files/nginx.conf

@@ -58,7 +58,7 @@ http {
 
         location /favicon.ico { alias /var/lib/awx/public/static/favicon.ico; }
 
-        location ~ ^/(websocket|network_ui/topology/) {
+        location /websocket {
             # Pass request to the upstream alias
             proxy_pass http://daphne;
             # Require http version 1.1 to allow for upgrade requests
@@ -86,6 +86,7 @@ http {
             uwsgi_read_timeout 120s;
             uwsgi_pass uwsgi;
             include /etc/nginx/uwsgi_params;
+            proxy_set_header X-Forwarded-Port 443;
         }
     }
 }