Partial merge of develop to experimental

Does not include #2336 as the file has been moved out from underneath it:
will do this separately

src/components/structures/login/ForgotPassword.js

@@ -36,6 +36,14 @@ module.exports = React.createClass({
         onLoginClick: PropTypes.func,
         onRegisterClick: PropTypes.func,
         onComplete: PropTypes.func.isRequired,
+
+        // The default server name to use when the user hasn't specified
+        // one. This is used when displaying the defaultHsUrl in the UI.
+        defaultServerName: PropTypes.string,
+
+        // An error passed along from higher up explaining that something
+        // went wrong when finding the defaultHsUrl.
+        defaultServerDiscoveryError: PropTypes.string,
     },
 
     getInitialState: function() {
@@ -45,6 +53,7 @@ module.exports = React.createClass({
             progress: null,
             password: null,
             password2: null,
+            errorText: null,
         };
     },
 
@@ -81,6 +90,13 @@ module.exports = React.createClass({
     onSubmitForm: function(ev) {
         ev.preventDefault();
 
+        // Don't allow the user to register if there's a discovery error
+        // Without this, the user could end up registering on the wrong homeserver.
+        if (this.props.defaultServerDiscoveryError) {
+            this.setState({errorText: this.props.defaultServerDiscoveryError});
+            return;
+        }
+
         if (!this.state.email) {
             this.showErrorDialog(_t('The email address linked to your account must be entered.'));
         } else if (!this.state.password || !this.state.password2) {
@@ -200,6 +216,12 @@ module.exports = React.createClass({
                 );
             }
 
+            let errorText = null;
+            const err = this.state.errorText || this.props.defaultServerDiscoveryError;
+            if (err) {
+                errorText = <div className="mx_Login_error">{ err }</div>;
+            }
+
             const LanguageSelector = sdk.getComponent('structures.login.LanguageSelector');
 
             resetPasswordJsx = (
@@ -230,6 +252,7 @@ module.exports = React.createClass({
                         <input className="mx_Login_submit" type="submit" value={_t('Send Reset Email')} />
                     </form>
                     { serverConfigSection }
+                    { errorText }
                     <a className="mx_Login_create" onClick={this.props.onLoginClick} href="#">
                         { _t('Return to login screen') }
                     </a>