DELTASPIKE-638 - Fix Checkstyle/formatting/rat issues