Merge pull request #29687 from basepi/merge-forward-2015.8

[2015.8] Merge forward from 2015.5 to 2015.8

doc/topics/releases/2015.5.7.rst

@@ -2,6 +2,14 @@
 Salt 2015.5.7 Release Notes
 ===========================
 
+.. note::
+
+    A significant orchestrate issue `#29110`_ was discovered during the release
+    process of 2015.5.7, so it has not been officially released.  Please use
+    `2015.5.8
+    <https://docs.saltstack.com/en/latest/topics/releases/2015.5.8.html>`_
+    instead.
+
 Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs):
 
 *Generated at: 2015-11-13T17:11:14Z*
@@ -202,6 +210,7 @@ Changes:
 
 - **PR** `#27568`_: (*jacobhammons*) regenerated man pages
 
+.. _`#29110`: https://github.com/saltstack/salt/issues/29110
 .. _`#25521`: https://github.com/saltstack/salt/pull/25521
 .. _`#25928`: https://github.com/saltstack/salt/pull/25928
 .. _`#27201`: https://github.com/saltstack/salt/pull/27201

salt/cloud/clouds/nova.py

@@ -340,7 +340,7 @@ def rackconnect(vm_):
     Either 'False' (default) or 'True'.
     '''
     return config.get_cloud_config_value(
-        'rackconnect', vm_, __opts__, default='False',
+        'rackconnect', vm_, __opts__, default=False,
         search_global=False
     )
 
@@ -362,7 +362,7 @@ def managedcloud(vm_):
     running. Either 'False' (default) or 'True'.
     '''
     return config.get_cloud_config_value(
-        'managedcloud', vm_, __opts__, default='False',
+        'managedcloud', vm_, __opts__, default=False,
         search_global=False
     )