Conflicts:

	master/bt5/vifib_erp5/bt/revision

Applied Rules are generated later.

Expose missing test features.

Builders are called globally, so deliveries are appearing earlier.

Rules have a bit more complex applying logic.

Conflicts:

	master/bt5/vifib_erp5/bt/revision

variation property which comes from Item generates getVariationPropertyList.
VariationRange's property defines variation_property which also generates
getVariationPropertyList

As there is conflict which is not solved by category accessor generation
sorting (which is per property sheet) adding later VariationRange will result
in overwriting accessor for category with own one.

Conflicts:

	master/bt5/vifib_base/bt/revision

Conflicts:

	master/bt5/vifib_base/bt/revision

Conflicts:

	master/bt5/vifib_data_simulation/bt/revision

Message was: <ERP5Type.ConsistencyMessage for PropertyTypeValidity on
    web_site_module/hosting (message: Attribute layout_additional_css should be
    of type string but is of type <type 'tuple'>)>

Conflicts:

	master/bt5/vifib_erp5/bt/revision

Conflicts:

	master/bt5/vifib_erp5/bt/revision

Conflicts:
	master/bt5/vifib_open_trade/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
	master/bt5/vifib_open_trade/bt/template_portal_type_property_sheet_list

Something wrong appened at previous merge to master. Cleaning.

Conflicts:
	master/bt5/vifib_web_ui_test/PathTemplateItem/portal_tests/vifib_web_zuite/TestKVM.xml
	master/bt5/vifib_web_ui_test/SkinTemplateItem/portal_skins/vifib_web_ui_test.xml
	master/bt5/vifib_web_ui_test/SkinTemplateItem/portal_skins/vifib_web_ui_test/Zuite_vifib_instanciation_macro_library.xml
	master/bt5/vifib_web_ui_test/bt/revision

Warning: if you thought that Romain's hack was dirty, this
is worse. Anyway, this could suffer from having several
slave instance with the same title. Be aware.

Conflicts:

	master/bt5/vifib_slap/bt/revision

Do not scatter so much between Business Templates portal type definitions.

This reverts commit ddeaf310.

Note: Always use pyflakes.