which are our main suspects for breaking testing in the master branch.
As this issue prevents many SO related patches from being merged let's
first revert those to make master work once again.
Issue-ID: SO-3216
Change-Id: I7f7daaaef3f7911afb5c8729c296773a630b5fb6 Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>