Merge remote-tracking branch 'origin/master'

changelog.html

@@ -71,6 +71,9 @@ Upcoming changes</a>
   <li class=bug>
     GET request to configSubmit wipes some configuration
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-11397">issue 11397</a>, <a href="https://issues.jenkins-ci.org/browse/JENKINS-7847">issue 7847</a>)
+  <li class=bug>
+    Jenkins logo headless when server is starting.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-11444">issue 11444</a>)
   <li class=rfe>
     Allow update center CA certificates to be placed in $JENKINS_HOME/update-center-rootCAs
 </ul>

core/src/main/resources/lib/layout/layout.jelly

@@ -235,7 +235,7 @@ THE SOFTWARE.
       <tr>
         <td id="side-panel" width="20%">
           <div style="margin-left: 20px; margin-right: 20px; border-top: 1px solid #bbb"></div>
-          <div id="navigation">
+          <div id="navigation" style="min-height: 323px; height: auto !important; height: 323px;">
             <j:set var="mode" value="side-panel" />
             <d:invokeBody />