Merge "fixed sonar issue in SvCLogicExprListener.java"