Add relevant types for creating text resources to dsl doc
Polish javadoc
Cleaning up conditional logic for version matching/selection

+review REVIEW-5224
A couple of integration test fixes.
Don't run this test on windows for now.
Merge branch 'release'