dsl: Fix javadoc and javac warnings
dsl/model: fix javac & doc errors and whitespace
Merge pull request #3162 from joshmoore/clean-build-dsl

clean build: dsl/model -- fix javac and javadoc warnings