Merge "Sonar Fix: YangParameters.java"