Merge "fixed major sonar issue in WebConfig.java"