Address code analysis issues

This change addresses the bugs which Sonar identified on
5 March 2020.   These were identified as Reliability bugs
two of which were found to be true issues; all were
addressed in hopes of keeping sonar quiet.

Issue-ID: RICAPP-78

Signed-off-by: E. Scott Daniels <daniels@research.att.com>
Change-Id: Id575817686395bbad9683b1df476e3e1e7fbd2b2
12 files changed