Merge "fix sonar issue in SpringContextHelper.java"