Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5

Conflicts:
    setup.py

salt/modules/schedule.py

@@ -103,6 +103,26 @@ def list_(show_all=False, return_yaml=True):
         return {'schedule': {}}
 
 
+def is_enabled(name):
+    '''
+    List a Job only if its enabled
+
+    .. versionadded:: 2015.5.3
+
+    CLI Example:
+
+    .. code-block:: bash
+
+        salt '*' schedule.is_enabled name=job_name
+    '''
+
+    current_schedule = __salt__['schedule.list'](show_all=False, return_yaml=False)
+    if name in current_schedule:
+        return current_schedule[name]
+    else:
+        return {}
+
+
 def purge(**kwargs):
     '''
     Purge all the jobs currently scheduled on the minion

setup.py

@@ -409,6 +409,8 @@ class Build(build):
 
 class Install(install):
     user_options = install.user_options + [
+        ('salt-transport=', None, 'The transport to prepare salt for. Choices are \'zeromq\' '
+                                  '\'raet\' or \'both\'. Defaults to \'zeromq\'', 'zeromq'),
         ('salt-root-dir=', None,
          'Salt\'s pre-configured root directory'),
         ('salt-config-dir=', None,
@@ -451,6 +453,7 @@ class Install(install):
         self.salt_base_master_roots_dir = None
         self.salt_logs_dir = None
         self.salt_pidfile_dir = None
+        self.salt_transport = None
 
     def finalize_options(self):
         install.finalize_options(self)