[SEBA-496]

Update pip packages used in XOS containers, flatten containers
Fixed invalid YAML generated by xosgenx modeldefs.xtarget

Change-Id: Ic051170f3f9ef5a5d0dbba61aa6843458a435d49
diff --git a/containers/chameleon/Dockerfile.chameleon b/containers/chameleon/Dockerfile.chameleon
index 1f36eb8..63084e1 100644
--- a/containers/chameleon/Dockerfile.chameleon
+++ b/containers/chameleon/Dockerfile.chameleon
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # xosproject/chameleon
-FROM xosproject/xos-base:3.0.1
+FROM xosproject/xos-base:3.0.2
 
 # xos-base already has protoc and dependencies installed
 
@@ -23,7 +23,19 @@
 COPY tmp.chameleon /chameleon/chameleon
 
 # Build the protos
-RUN pip install docker==3.1.4 klein==17.10.0 fluent-logger==0.9.2 \
+RUN pip install \
+    Jinja2==2.10 \
+    PyYAML==5.1 \
+    docker==3.7.0 \
+    fluent-logger==0.9.3 \
+    grpcio-tools==1.12.0 \
+    grpcio==1.12.0 \
+    klein==17.10.0 \
+    netifaces==0.10.9 \
+    pyOpenSSL==19.0.0 \
+    python-consul==1.1.0 \
+    service_identity==18.1.0 \
+    simplejson==3.16.0 \
  && chdir chameleon/chameleon/protos \
  && VOLTHA_BASE=anything make