Merge "HistoryDAO.java-sonar fixes"