Merge branch '2.0' into FearlessKiwis-MAGETWO-57065-admin-stuck-on-changing-password-2.0

Author: Mike Weis

setup/view/magento/setup/create-backup.phtml

@@ -46,12 +46,6 @@
         role="form"
         >
         <fieldset class="form-fieldset">
-            <div class="message message-warning">
-                <span class="message-text">
-                    <strong>We’ll put your store in maintenance mode to protect your shoppers during the {{type}}.
-                        After this point, you cannot cancel the {{type}}.</strong>
-                </span>
-            </div>
             <div class="row form-row">
                 <div class="col-m-3">
                     <label class="form-label">

setup/view/magento/setup/start-updater.phtml

@@ -19,36 +19,25 @@
 
 <h2 class="page-title">{{$state.current.header}}</h2>
 
-<div ng-show="maintenanceCalled && maintenanceStatus">
-    <span class="readiness-check-icon icon-success-round"></span>
-    <div class="readiness-check-content">
-        <h3 class="readiness-check-title">Store in maintenance mode</h3>
-        <p>
-            Your store is in maintenance mode and will automatically
-            return online after the {{type}}.
-        </p>
-    </div>
-</div>
-
-<div ng-show="maintenanceCalled && !maintenanceStatus">
-    <span class="readiness-check-icon icon-failed-round"></span>
-    <div class="readiness-check-content">
-        <h3 class="readiness-check-title">Check store maintenance availability</h3>
-        <p>
-            Cannot put your store in maintenance mode. Please fix that, and try again.
-        </p>
-        <p>
-            Error received from server:
-            <br> {{errorMsg}}
-        </p>
-    </div>
+<div class="message message-warning">
+    <span class="message-text">
+        <strong>
+            We will take your store offline to protect shoppers during the duration of the {{type}} activity.
+        </strong>
+        <div ng-show="type == 'upgrade'">
+            Before you start upgrade, you can optionally
+            <a href="http://devdocs.magento.com/guides/v2.1/comp-mgr/trouble/cman/maint-mode.html">
+            configure a custom maintenance page</a> that informs shoppers the store is offline.
+            (Magento provides a default page.)
+        </div>
+    </span>
 </div>
 
 <form
     novalidate
     name="start-updater"
-    ng-show="maintenanceCalled == maintenanceStatus"
     >
+
     <div ng-repeat="package in packages">
         <div>We're ready to {{type}} {{package.name}}{{package.version ? ' to ' + package.version : ''}}. </div>
     </div>