Update git submodules

* Update heat from branch 'master'
  - Load existing resources using correct environment
    
    In convergence we were loading resources from the database using the
    current environment. This is incorrect when a previous update has
    failed, meaning the resources in the database were created with a
    non-current template and environment. If an attempt was made to change
    the type of a resource but that resource was never updated, this will
    result in us loading a resource with the wrong type. If the type has
    been removed then it can result in errors just trying to show the stack.
    
    Note that the Resource.load() method used during a convergence traversal
    already does the Right Thing - it only uses the new type if it is a
    valid substitution for the old type, and UpdateReplace is later raised
    in Resource.update_convergence() if the type does not match in that
    specified in the new environment. So we don't see any problems with
    stack updates, just with API calls.
    
    Since we cannot change the signature of Resource.__new__() without also
    modifying the signature of __init__() in every resource plugin that has
    implemented it (many of which are out of tree), instead substitute the
    stack definition for the duration of creating the Resource object. This
    will result in stack.env returning the environment the resource was last
    updated with.
    
    Change-Id: I3fbd14324fc4681b26747ee7505000b8fc9439f1
    Story: #2005090
    Task: 29688

heat

@@ -1 +1 @@
-Subproject commit 7ffcda79da804fa616d991c80a02c55969d4b81b
+Subproject commit aa58fbcacfdc14bb2e8d5a4ff1ef7a47fe9268d0