Merge "Sonar Fixes - ActionPuntDAO and subclasses"