more work towards the stability
fix SingleWebServerExample
Merge branch 'feature/locations-and-hierarchy' of github.com:cloudsoft/brooklyn-docker into grkvlt/locations-and-hierarchy

* 'feature/locations-and-hierarchy' of github.com:cloudsoft/brooklyn-docker:
  fix SingleWebServerExample
  more work towards the stability

Conflicts:
	docker/src/main/java/brooklyn/entity/container/docker/DockerInfrastructure.java
	docker/src/main/java/brooklyn/entity/container/docker/DockerInfrastructureImpl.java
	docker/src/main/java/brooklyn/entity/container/docker/DockerNodePlacementStrategy.java
	docker/src/main/java/brooklyn/location/docker/DockerContainerLocation.java
	docker/src/main/java/brooklyn/location/docker/DockerLocation.java