Merge pull request #355 from raghavgautam/master

Cleanup
writeFeedElement methods moved
check all feed from dataSets in writeFeedElement
files sort simplified
Merge pull request #357 from rostafiychuk/master

cleanup
hardcoded timeouts reverted
hardcoded timeouts reverted
test timeout increased
Merge pull request #358 from pisaychuk/analysis

Analysis, tests fixes
Merge pull request #359 from raghavgautam/master

RetentionTest cleanup
FALCON-597: String logged at the start and end of the merlin test are slightly mismatched