diff -Nru maas-2.3.4-6508-g4f77e30/debian/changelog maas-2.3.5-6511-gf466fdb/debian/changelog
--- maas-2.3.4-6508-g4f77e30/debian/changelog	2018-07-31 00:30:01.000000000 +0000
+++ maas-2.3.5-6511-gf466fdb/debian/changelog	2018-08-23 16:30:04.000000000 +0000
@@ -1,3 +1,11 @@
+maas (2.3.5-6511-gf466fdb-0ubuntu1) xenial-proposed; urgency=medium
+
+  * Stable Release Update. New upstream release, MAAS 2.3.5 (LP: #1772010):
+    - MAAS 2.3.5 is a new upstream release that fixes a regressions that
+      affects some users using the MAAS built-in proxy in 2.3.4.
+
+ -- Andres Rodriguez <andreserl@ubuntu.com>  Thu, 23 Aug 2018 12:30:04 -0400
+
 maas (2.3.4-6508-g4f77e30-0ubuntu1) xenial-proposed; urgency=medium
 
   * Stable Release Update. New upstream release, MAAS 2.3.4 (LP: #1772010):
diff -Nru maas-2.3.4-6508-g4f77e30/src/maasserver/compose_preseed.py maas-2.3.5-6511-gf466fdb/src/maasserver/compose_preseed.py
--- maas-2.3.4-6508-g4f77e30/src/maasserver/compose_preseed.py	2018-07-30 20:31:33.000000000 +0000
+++ maas-2.3.5-6511-gf466fdb/src/maasserver/compose_preseed.py	2018-08-17 02:41:34.000000000 +0000
@@ -42,6 +42,8 @@
             return http_proxy
         else:
             maas_proxy_port = Config.objects.get_config("maas_proxy_port")
+            if not maas_proxy_port:
+                maas_proxy_port = 8000
             url = "http://:%d/" % maas_proxy_port
             return compose_URL(
                 url, get_maas_facing_server_host(
diff -Nru maas-2.3.4-6508-g4f77e30/src/maasserver/forms/__init__.py maas-2.3.5-6511-gf466fdb/src/maasserver/forms/__init__.py
--- maas-2.3.4-6508-g4f77e30/src/maasserver/forms/__init__.py	2018-07-30 20:31:33.000000000 +0000
+++ maas-2.3.5-6511-gf466fdb/src/maasserver/forms/__init__.py	2018-08-17 02:41:34.000000000 +0000
@@ -1432,7 +1432,16 @@
     enable_http_proxy = get_config_field('enable_http_proxy')
     use_peer_proxy = get_config_field('use_peer_proxy')
     http_proxy = get_config_field('http_proxy')
-    maas_proxy_port = get_config_field('maas_proxy_port')
+    # LP: #1787381 - Fix an issue where the UI is overriding config fields
+    # that are *only* exposed over the API.
+    #
+    # XXX - since the UI for these options has been converted to Angular,
+    # MAAS no longer automatically creates fields for these based on the
+    # settings forms. As such, this form doesn't validate against the
+    # settings form (as the DNSForm would do, for example). As such
+    # .
+    # These fields need to be added back once LP: #1787467 is fixed.
+    # maas_proxy_port = get_config_field('maas_proxy_port')
 
 
 class DNSForm(ConfigForm):
diff -Nru maas-2.3.4-6508-g4f77e30/src/provisioningserver/templates/proxy/maas-proxy.conf.template maas-2.3.5-6511-gf466fdb/src/provisioningserver/templates/proxy/maas-proxy.conf.template
--- maas-2.3.4-6508-g4f77e30/src/provisioningserver/templates/proxy/maas-proxy.conf.template	2018-07-30 20:31:33.000000000 +0000
+++ maas-2.3.5-6511-gf466fdb/src/provisioningserver/templates/proxy/maas-proxy.conf.template	2018-08-17 02:41:34.000000000 +0000
@@ -23,7 +23,11 @@
 http_access allow localhost
 http_access deny all
 http_port 3128 transparent
+{{if not maas_proxy_port}}
+http_port 8000
+{{else}}
 http_port {{maas_proxy_port}}
+{{endif}}
 refresh_pattern ^ftp:           1440    20%     10080
 refresh_pattern -i (/cgi-bin/|\?) 0     0%      0
 refresh_pattern \/Release(|\.gpg)$                        0    0%    0 refresh-ims