Merge "Sonar Fix: RestconfApiUtils.java"