Bug-731 Fixed few minor Sonar warnings

Change-Id: Id1ac7061e395f4feca8d29304785d03ef14007ad
Signed-off-by: Milos Fabian <milfabia@cisco.com>
Merge "Bug-731 Fixed few minor Sonar warnings"