Fixing CLI integration test
- Uses ApplicationBuilder
- Reports original exception for timeouts
Merge pull request #612 from grkvlt/cli-integration-test

Fixing CLI integration test
Merge BrooklynLauncher and BrooklynLauncherCli

- Moves BrooklynLauncherCli code into BrooklynLauncher
- Deprecates the old BrooklynLauncher way of doing things
- Updates brooklyn.demo.legacy.* to use new BrooklynLauncher way
minor tidies