Merge branch 'master' into support/apply-bootstrap4

# Conflicts:
#	src/client/js/components/Admin/Security/LdapAuthTestModal.jsx
#	src/client/styles/scss/style-app.scss

src/client/js/components/Admin/Security/LdapAuthTestModal.jsx

@@ -59,7 +59,6 @@ class LdapAuthTestModal extends React.Component {
             onChangePassword={this.onChangePassword}
           />
         </ModalBody>
-        <ModalFooter />
       </Modal>
     );
   }