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
BrooklynLauncher: incorporate review comments
Merge pull request #607 from aledsage/fix/BrooklynLauncher

Fix/brooklyn launcher