Merge branch '1.4.0.x' of github.com:influxdata/chronograf into 1.4.0.x

ui/src/auth/Login.js

@@ -22,7 +22,7 @@ const Login = ({authData: {auth}}) => {
           auth.links.map(({name, login, label}) =>
             <a key={name} className="btn btn-primary" href={login}>
               <span className={`icon ${name}`} />
-              Login with {label}
+              Log in with {label}
             </a>
           )}
       </SplashPage>

ui/src/auth/PurgatoryAuthItem.js

@@ -23,7 +23,7 @@ const PurgatoryAuthItem = ({roleAndOrg, onClickLogin, superAdmin}) =>
           className="btn btn-sm btn-primary"
           onClick={onClickLogin(roleAndOrg.organization)}
         >
-          Login
+          Log in
         </button>
       : <span className="auth--list-blocked">
           Contact your Admin<br />for access