Merge "fixed sonar issues in MdsalHelper.java"