Merge branch '2016.11' into '2017.7'

No conflicts.

doc/ref/index.rst

@@ -11,6 +11,7 @@ This section contains a list of the Python modules that are used to extend the v
     ../ref/auth/all/index
     ../ref/beacons/all/index
     ../ref/cache/all/index
+    ../ref/clouds/all/index
     ../ref/engines/all/index
     ../ref/file_server/all/index
     ../ref/grains/all/index

tests/integration/files/file/base/pip-installed-weird-install.sls

@@ -29,7 +29,7 @@ setup_test_virtualenv:
 
 carbon-weird-setup:
   pip.installed:
-    - name: carbon
+    - name: 'carbon < 1.1'
     - no_deps: True
     - bin_env: {{ virtualenv_test }}
     - onchanges:

tests/integration/states/test_pip.py

@@ -159,19 +159,19 @@ class PipStateTest(ModuleCase, SaltReturnAssertsMixin):
             # some of the state return parts
             for key in six.iterkeys(ret):
                 self.assertTrue(ret[key]['result'])
-                if ret[key]['name'] != 'carbon':
+                if ret[key]['name'] != 'carbon < 1.1':
                     continue
                 self.assertEqual(
                     ret[key]['comment'],
-                    'There was no error installing package \'carbon\' '
+                    'There was no error installing package \'carbon < 1.1\' '
                     'although it does not show when calling \'pip.freeze\'.'
                 )
                 break
             else:
                 raise Exception('Expected state did not run')
         finally:
-            if os.path.isdir('/opt/graphite'):
-                shutil.rmtree('/opt/graphite')
+            if os.path.isdir(ographite):
+                shutil.rmtree(ographite)
 
     def test_issue_2028_pip_installed_state(self):
         ret = self.run_function('state.sls', mods='issue-2028-pip-installed')