Merge pull request #32088 from rallytime/merge-2015.8

[2015.8] Merge forward from 2015.5 to 2015.8

salt/auth/ldap.py

@@ -84,8 +84,10 @@ class _LDAPConnection(object):
         self.binddn = binddn
         self.bindpw = bindpw
         if not HAS_LDAP:
-            raise CommandExecutionError('Failed to connect to LDAP, module '
-                                        'not loaded')
+            raise CommandExecutionError(
+                'LDAP connection could not be made, the python-ldap module is '
+                'not installed. Install python-ldap to use LDAP external auth.'
+            )
         if self.uri == '':
             self.uri = '{0}://{1}:{2}'.format(schema, self.server, self.port)
 

salt/modules/pacman.py

@@ -27,7 +27,7 @@ def __virtual__():
     '''
     Set the virtual pkg module if the os is Arch
     '''
-    if __grains__['os'] in ('Arch', 'Arch ARM'):
+    if __grains__['os'] in ('Arch', 'Arch ARM', 'ManjaroLinux'):
         return __virtualname__
     return False
 

salt/modules/state.py

@@ -44,7 +44,6 @@ __outputter__ = {
     'highstate': 'highstate',
     'template': 'highstate',
     'template_str': 'highstate',
-    'apply': 'highstate',
     'apply_': 'highstate',
     'request': 'highstate',
     'check_request': 'highstate',