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