Merge remote-tracking branch 'origin/master' into versionoso

Conflicts:
	master/bt5/vifib_slap/bt/revision

master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/scripts/SoftwareInstance_bangSoftwareInstanceTree.xml

@@ -55,7 +55,7 @@ portal = software_instance.getPortalObject()\n
 \n
 root_hosting_subscription = portal.portal_catalog.getResultValue(uid=software_instance.SoftwareInstance_getRootHostingSubscriptionUid())\n
 tag = \'%s_%s_inProgress\' % (software_instance.getUid(), root_hosting_subscription.getTitle())\n
-root_software_instance = root_hosting_subscription.HostingSubscription_requestRootSoftwareInstance(tag)\n
+root_software_instance = root_hosting_subscription.getPredecessorValue()\n
 \n
 # Use iterative algorithm instead of recursive approach in order to avoid\n
 # complexity as much as possible.\n

master/bt5/vifib_base/bt/revision

-410
+411
\ No newline at end of file

master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/interactions/Delivery_fixConsistency.xml

@@ -27,15 +27,15 @@
         <item>
             <key> <string>after_script_name</string> </key>
             <value>
-              <list>
-                <string>Delivery_fixConsistency</string>
-              </list>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>before_commit_script_name</string> </key>
             <value>
-              <tuple/>
+              <list>
+                <string>Delivery_fixConsistency</string>
+              </list>
             </value>
         </item>
         <item>

master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/interactions/SoftwareInstance_fixConsistency.xml

@@ -27,15 +27,15 @@
         <item>
             <key> <string>after_script_name</string> </key>
             <value>
-              <list>
-                <string>SoftwareInstnace_fixConsistency</string>
-              </list>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>before_commit_script_name</string> </key>
             <value>
-              <tuple/>
+              <list>
+                <string>SoftwareInstance_fixConsistency</string>
+              </list>
             </value>
         </item>
         <item>

master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/SoftwareInstnace_fixConsistency.xml → master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/SoftwareInstance_fixConsistency.xml

@@ -59,7 +59,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>SoftwareInstnace_fixConsistency</string> </value>
+            <value> <string>SoftwareInstance_fixConsistency</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/vifib_slap/bt/revision

-619
+620
\ No newline at end of file