DXML-21: Rename deftests so they all have unique names

to avoid some tests being ignored completely.

Signed-off-by: Ryan Senior <ryan.senior@puppetlabs.com>
Remove duplicate test-indent, collapsed defaults and defaults-2 tests
into one
Fixed the indentation tests for JDK 1.8