Merge pull request #858 from mattermost/PLT-425

PLT-425 changing wording

web/react/components/admin_console/email_settings.jsx

@@ -288,7 +288,7 @@ export default class EmailSettings extends React.Component {
                             className='control-label col-sm-4'
                             htmlFor='feedbackName'
                         >
-                            {'Feedback Name:'}
+                            {'Notification Display Name:'}
                         </label>
                         <div className='col-sm-8'>
                             <input
@@ -310,7 +310,7 @@ export default class EmailSettings extends React.Component {
                             className='control-label col-sm-4'
                             htmlFor='feedbackEmail'
                         >
-                            {'Feedback Email:'}
+                            {'Notification Email Address:'}
                         </label>
                         <div className='col-sm-8'>
                             <input