Cli integration: add docker options & fix the wait at the end

This adds support for setting DOCKER_GRAPHDRIVER and DOCKER_EXECDRIVER to select the graph driver and the execution driver for the cli integration tests.

This PR also fixes a race at the end of the test-integration-cli which makes the tests always fail on some systems.