[SEBA-512]

Fix xosgenx's handling of optional/required modifiers in relation to
the null and blank options, which was nondeterministic depending on the
order of items iterated over in the options dictionary.

Don't allow 'Null' booleans

Change-Id: I3f21180ec11c7e43794c04ebe479d50c11f6271c
diff --git a/containers/chameleon/Dockerfile.chameleon b/containers/chameleon/Dockerfile.chameleon
index 90ae1e1..33f64b0 100644
--- a/containers/chameleon/Dockerfile.chameleon
+++ b/containers/chameleon/Dockerfile.chameleon
@@ -13,8 +13,7 @@
 # limitations under the License.
 
 # xosproject/chameleon
-
-FROM xosproject/xos-base:2.2.3
+FROM xosproject/xos-base:2.2.4
 
 # xos-base already has protoc and dependencies installed
 
diff --git a/containers/xos/Dockerfile.client b/containers/xos/Dockerfile.client
index 331f503..ea54ab0 100644
--- a/containers/xos/Dockerfile.client
+++ b/containers/xos/Dockerfile.client
@@ -13,8 +13,7 @@
 # limitations under the License.
 
 # xosproject/xos-client
-
-FROM xosproject/xos-libraries:2.2.3
+FROM xosproject/xos-libraries:2.2.4
 
 # Install XOS client
 COPY lib/xos-api /tmp/xos-api
diff --git a/containers/xos/Dockerfile.libraries b/containers/xos/Dockerfile.libraries
index 3b87c5a..6a58d7d 100644
--- a/containers/xos/Dockerfile.libraries
+++ b/containers/xos/Dockerfile.libraries
@@ -13,8 +13,7 @@
 # limitations under the License.
 
 # xosproject/xos-libraries
-
-FROM xosproject/xos-base:2.2.3
+FROM xosproject/xos-base:2.2.4
 
 # Add libraries
 COPY lib /opt/xos/lib
diff --git a/containers/xos/Dockerfile.synchronizer-base b/containers/xos/Dockerfile.synchronizer-base
index b27815a..042f7c6 100644
--- a/containers/xos/Dockerfile.synchronizer-base
+++ b/containers/xos/Dockerfile.synchronizer-base
@@ -13,8 +13,7 @@
 # limitations under the License.
 
 # xosproject/xos-synchronizer-base
-
-FROM xosproject/xos-client:2.2.3
+FROM xosproject/xos-client:2.2.4
 
 COPY xos/synchronizers/new_base /opt/xos/synchronizers/new_base
 COPY xos/xos/logger.py /opt/xos/xos/logger.py
diff --git a/containers/xos/Dockerfile.xos-core b/containers/xos/Dockerfile.xos-core
index 431f002..d0d7605 100644
--- a/containers/xos/Dockerfile.xos-core
+++ b/containers/xos/Dockerfile.xos-core
@@ -13,8 +13,7 @@
 # limitations under the License.
 
 # xosproject/xos-core
-
-FROM xosproject/xos-libraries:2.2.3
+FROM xosproject/xos-libraries:2.2.4
 
 # Install XOS
 ADD xos /opt/xos
diff --git a/containers/xos/pip_requested.txt b/containers/xos/pip_requested.txt
index c3a3098..889110e 100644
--- a/containers/xos/pip_requested.txt
+++ b/containers/xos/pip_requested.txt
@@ -28,7 +28,7 @@
 oslo.serialization==2.25.0
 oslo.utils==3.36.0
 ply==3.11
-plyxproto==3.1.0
+plyxproto==4.0.0
 protobuf==3.5.2
 prometheus_client==0.4.0
 # Avoids a warning, see http://initd.org/psycopg/docs/faq.html#faq-compile
diff --git a/containers/xos/pip_requirements.txt b/containers/xos/pip_requirements.txt
index f8e4ec4..cb62170 100644
--- a/containers/xos/pip_requirements.txt
+++ b/containers/xos/pip_requirements.txt
@@ -86,7 +86,7 @@
 pika-pool==0.1.3
 pipdeptree==0.13.0
 ply==3.11
-plyxproto==3.1.0
+plyxproto==4.0.0
 prettytable==0.7.2
 prometheus-client==0.4.0
 protobuf==3.5.2