Merge "fixed sonar issue in DBConfigFactory"