#454 #509 - Checkstyle fixes for deployment