re-enable docker driver
fixes to Vagrantfile
m1_demo cut
cleanup of Vagrant env
some fixes
working for docker-driver without contrib
fixed for docker driver having devstack contrib
Merge branch 'docker_driver'