[512834] Refactor code from Utilities working set after SonarQube
analysis.

https://bugs.eclipse.org/bugs/show_bug.cgi?id=512834

Change-Id: I4c17fe0617130bec8e4a96ece9c23e7c3c2c6e7b
Signed-off-by: William Enright <william.enright@ericsson.com>
63 files changed