Moved CliIntegrationTest and added explicit AssertionError check in catch blocks
Typo in example name
Tidy up distribution archive config and add sample Catalog XML file
Updated makeValidFilename and makeValidJavaName methods and added isBlank check, using Guava CharMatcher
Merge pull request #542 from grkvlt/move-cli-integration-tests

Move CLI Integration Tests
Merge pull request #544 from grkvlt/strings

Updates to Strings methods using Guava CharMatcher
Fix install-dir to not use Impl entity suffix

- Adds EntityType.getSimpleName
- Use entity.getEntityType().getSimpleName(), rather than doing
  entity.getClass().getSimpleName()
EntityType.getSimpleType: incorporate review comments

- Also converts EntityTypeTest from groovy to java
Merge pull request #540 from aledsage/fix/InstallDir-DoNotUseImplNames

Fix install-dir to not use Impl entity suffix