Add support for new docker restart policies
Merge branch 'docker_restart_199' into gini

Conflicts:
	cloud/docker/docker.py