m1_demo cut
cleanup of Vagrant env
some fixes
working for docker-driver without contrib