Merge pull request #307 from tbak/2.x

2.x Refactor embedded cluster.
Embedded cluster/integration tests update.