Correcting issues from Sonar (syntax)

Change-Id: I569e1ff4ccafeae2278d275d848407070861296f
Issue-ID: DCAEGEN2-1342
Signed-off-by: kjaniak <kornel.janiak@nokia.com>
11 files changed