Refactor embedded cluster.
Merge remote-tracking branch 'remotes/netflix/2.x' into 2.x
Embedded cluster + junit ExternalResource update.
Merge pull request #307 from tbak/2.x

2.x Refactor embedded cluster.
Simplifying and standardizing retryable channels
Reverting commented out values