Fixed some issues in the container lists in the Makefile and in
containers.cfg. An obscure KVM bug was not digesting host-model
properly on some architectures causing a kernal panic on boot.
In order to work around that bug, host-passthrough will be used
until KVM is fixed in ubuntu16.04. This bug doesn't exist in
ubuntu14.

Change-Id: I7b99bd249ca3222d47cbc6a642177f7e6390049a
diff --git a/Makefile b/Makefile
index eb970c6..02e386e 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@
 
 VENVDIR := venv-$(shell uname -s | tr '[:upper:]' '[:lower:]')
 
-.PHONY: $(DIRS) $(DIRS_CLEAN) $(DIRS_FLAKE8) flake8 docker-base voltha chameleon ofagent podder netconf shovel onos dashd vcli portainer grafana nginx consul registrator envoy golang envoyd
+.PHONY: $(DIRS) $(DIRS_CLEAN) $(DIRS_FLAKE8) flake8 docker-base voltha chameleon ofagent podder netconf shovel onos dashd vcli portainer grafana nginx consul registrator envoy golang envoyd tools
 
 # This should to be the first and default target in this Makefile
 help:
@@ -99,7 +99,7 @@
 
 jenkins-containers: docker-base voltha chameleon ofagent netconf consul registrator
 
-prod-containers: docker-base voltha chameleon ofagent netconf shovel dashd vcli grafana consul registrator golang envoyd envoy fluentd
+prod-containers: docker-base voltha chameleon ofagent netconf shovel dashd vcli grafana consul tools golang envoyd envoy fluentd
 
 containers: docker-base voltha chameleon ofagent podder netconf shovel onos tester config-push dashd vcli portainer grafana nginx consul registrator tools golang envoyd envoy fluentd