Fix policy/engine due to sonar changes in common

Fixed breakages due to changes made in policy/common to satisfy
sonar.

Change-Id: I88090c7549ba19f9eb45fae311e8811e39f30318
Issue-ID: POLICY-1791
Signed-off-by: Jim Hahn <jrh3@att.com>
11 files changed