Cleaned up checkstyle properties
merging 'feature/cleancheckstyle' into develop