Merge "Sonar fix: ApprovalDAO.java"