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

master/bt5/vifib_open_trade/PortalTypePropertySheetTemplateItem/property_sheet_list.xml

+<property_sheet_list>
+ <portal_type id="Hosting Subscription">
+  <item>VariationRange</item>
+ </portal_type>
+</property_sheet_list>
\ No newline at end of file

master/bt5/vifib_open_trade/bt/revision

-140
\ No newline at end of file
+141
\ No newline at end of file

master/bt5/vifib_open_trade/bt/template_portal_type_property_sheet_list

+Hosting Subscription | VariationRange
\ No newline at end of file

master/bt5/vifib_slap/PortalTypePropertySheetTemplateItem/property_sheet_list.xml

@@ -2,9 +2,6 @@
  <portal_type id="Computer Partition">
   <item>ComputerPartition</item>
  </portal_type>
- <portal_type id="Hosting Subscription">
-  <item>VariationRange</item>
- </portal_type>
  <portal_type id="System Preference">
   <item>VifibSystemPreference</item>
  </portal_type>

master/bt5/vifib_slap/bt/revision

-495
\ No newline at end of file
+497
\ No newline at end of file

master/bt5/vifib_slap/bt/template_path_list

 portal_alarms/confirm_ordered_sale_order
 portal_alarms/stop_planned_sale_invoice_transaction
 portal_alarms/vifib_check_consistency
-portal_alarms/vifib_trigger_build
+portal_alarms/vifib_trigger_build
\ No newline at end of file

master/bt5/vifib_slap/bt/template_portal_type_property_sheet_list

 Computer Partition | ComputerPartition
-Hosting Subscription | VariationRange
 System Preference | VifibSystemPreference
 Virtio Partition | ComputerPartition
\ No newline at end of file