Merge remote-tracking branch 'origin/master' into software-cleanup

master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SalePackingListLine_checkAndCancelCleanupPartition.xml

@@ -55,6 +55,9 @@ movement = context\n
 portal = movement.getPortalObject()\n
 cleanup_service = portal.portal_preferences.getPreferredInstanceCleanupResource()\n
 \n
+if context.getSimulationState() == \'cancelled\':\n
+  return\n
+\n
 instance = movement.getAggregateValue(portal_type="Software Instance")\n
 # Search for other cleanup packing list (generated by UI double click for\n
 # example)\n