merge and resolve conflict

installer/roles/image_build/templates/nginx.conf

@@ -16,6 +16,8 @@ http {
                       '$status $body_bytes_sent "$http_referer" '
                       '"$http_user_agent" "$http_x_forwarded_for"';
 
+    access_log /dev/stdout main;
+
     map $http_upgrade $connection_upgrade {
         default upgrade;
         ''      close;
@@ -56,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
@@ -87,6 +89,7 @@ http {
             {%- if extra_nginx_include is defined %}
             include {{ extra_nginx_include }};
             {%- endif %}
+            proxy_set_header X-Forwarded-Port 443;
         }
     }
 }