Merge branch '2014.7' into '2015.2'

Conflicts:
	tests/buildpackage.py

salt/states/service.py

@@ -93,7 +93,6 @@ def _enable(name, started, result=True, **kwargs):
     if __salt__['service.enabled'](name, **kwargs):
         # Service is enabled
         if started is True:
-            ret['changes'][name] = True
             ret['comment'] = ('Service {0} is already enabled,'
                               ' and is running').format(name)
             return ret

tests/buildpackage.py

@@ -7,7 +7,9 @@
 # This script is designed for speed, therefore it does not use mock and does not
 # run tests. It *will* install the build deps on the machine running the script.
 #
-# pylint: disable=E0599
+
+# pylint: disable=file-perms
+
 import errno
 import glob
 import logging

tests/jenkins.py

@@ -468,6 +468,7 @@ def run(opts):
                 'SALT_MINION_BOOTSTRAP_RELEASE',
                 opts.bootstrap_salt_commit[:7]
             )
+            print('Minion reported salt version: {0}'.format(version_info))
             if bootstrap_minion_version not in version_info[vm_name]:
                 print('\n\nATTENTION!!!!\n')
                 print('The boostrapped minion version commit does not contain the desired commit:')

tests/runtests.py

@@ -3,6 +3,8 @@
 '''
 Discover all instances of unittest.TestCase in this directory.
 '''
+# pylint: disable=file-perms
+
 # Import python libs
 from __future__ import print_function
 import os

tests/saltsh.py

@@ -20,6 +20,7 @@ A history file is maintained in ~/.saltsh_history.
 completion behavior can be customized via the ~/.inputrc file.
 
 '''
+# pylint: disable=file-perms
 
 # Import python libs
 import atexit