Merge "Sonar Fix: WebConfig.java"