This reverts commit ee2553c6.

Conflicts:

	master/bt5/vifib_slap/bt/revision

This reverts commit 296fdfb7.

Conflicts:

	master/bt5/vifib_base/bt/revision
	master/bt5/vifib_slap/bt/revision

Changes were not added during slave_instance_cleanup work.

Person and Software Instance state has changed from slap_state to payment_state.

Person and Software Instance slap states have to be catalogged so reuse
existing column.

This is future compatible, as same state will be used to lock operations
of Person or Software Instance.

expectedFailure can result in divergent documents, and it is impossible to
fine tune workflow divergence checking.

Anyway skip and excepted failure has same outcome: ignored the test result, and
skip just do not run the test.

Old modification was left by mistake.

Software Releases might be archived after some time, so do not check for thier
state on stabilised PPLs.

This reverts commit 52b8a896.

This reverts commit 072730ef.

Yes, indeed, there is no SSL configuration required on destroyed Software
Instance.

Only two complaints about destroyed instances are accepted.

Only two complaints about destroyed instances are accepted.

This reverts commit 4b4348f0.

Conflicts:

	master/bt5/vifib_base/bt/revision

It is better to fix some tests, than have too relaxed constraint.

Person can have trade conditions which do not specialise any other, but while
setting up trade condition on sale order, only those which are specialising
vifib_trade_condition are interesting.

When person will register to vifib in order to add his own computer and request
instance there will be incorrectly configured Sale Packing List.

Conflicts:
	slapos/format.py

It is using internally related to alarm last active process date, so create
such active process.

This reverts commit 7250ac74.

It might be better idea to just ignore this problem in test, instead of
relaxing too much the constraint.

Conflicts:

	master/bt5/vifib_erp5/bt/revision