Minor upgrades

To avoid ssh connection errors (https://github.com/peterabbott/kitchen-docker/issues/3), sleep 1 second before call **wait_for_sshd**
Reduce the number of intermediate containers to speed up converge phase