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

Conflicts:
	master/bt5/vifib_upgrader/bt/revision

master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/SaleTradeCondition_deleteIfNotNeeded.xml

@@ -53,7 +53,7 @@
             <value> <string>assert(context.getPortalType() == \'Sale Trade Condition\')\n
 \n
 if context.getTitle() == \'ViFiB Custom Conditions\':\n
-  assert(len(context.getSpecialiseRelatedValueList()) == 0)\n
+  assert(len([q for q in context.getSpecialiseRelatedValueList() if q.getPortalType() in context.getPortalDeliveryTypeList()]) == 0)\n
   assert(len(context.contentValues()) == 0)\n
   context.getParentValue().deleteContent(id=context.getId())\n
 </string> </value>

master/bt5/vifib_upgrader/bt/revision

-78
+79
\ No newline at end of file