Address sonar grumblings

The jwrapper parsing code was refactored to address several grumblings
that sonar had about the code and to fix some bad practices.

Issue-ID: RIC-629

Signed-off-by: E. Scott Daniels <daniels@research.att.com>
Change-Id: Ia42d676613d7eddbaa66a46f325dccd2ed783ad3
diff --git a/CHANGES b/CHANGES
index 2e7cbff..5a9ef6c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@
 # squished to one.
 
 release = Cherry
+2020 July 31; version 2.2.1
+	Correct "bugs" according to sonar (RIC-629)
+
 2020 July 30; version 2.2.0
 	Add support for configuration file reading and change notification.