Fix Sonar issues in policy-utils

Fixed the Sonar issues in policy-utils that required minimal
refactoring of the code.

Issue-ID: POLICY-460
Change-Id: Ie88fb1d819f343c8c0bc4d0b73e41089d79cdb6c
Signed-off-by: Charles Cole <cc847m@att.com>
3 files changed