Revert "Merge pull request #911 from irentu/oesb-3808"

This reverts commit 37d51b7810d16f0c1bf16eb455d5d28d5006cb57, reversing
changes made to 75f2b9febfa0e47be7e21b529f4911d984f8d64c.
[OPENENGSB-3652] fix ITests stability issues