2.x Embedded cluster/integration tests update.