Merge "Sonar fix: ResourceJdbcDaoImpl.java"