Comments out defaults which are already defined in Java classes
Merge branch 'develop' into feature/WW-4267-removes-defaults
WW-4267 finishes merging changes to develop