Merge lp://qastaging/~landscape/landscape-charm/dev-deployer-use-single-local-yaml into lp://qastaging/~landscape/landscape-charm/trunk

./dev/deployer now writes a single bundle file that contains the target bundle updates and any overrides we provide for license file etc.

As part of Last week's OPL release, we also bumped landscape-charm bundles to v4 (lp:~landscape/landscape-charm/bundles-trunk revision18). This change altered our bundle files
from bundles that were based on a high-level target name to bundles lacking that name. It broke our ./dev/deployer script in lp:landscape-charm which tries to augment a bundle target name that no longer exists.

Instead of passing a second skeletal config file that only contains overrides, our ./dev/deployer script will create a single bundle config file containing all of the base bundle values and any expected overrides and all of the base bundle config options.

With a single config file, we no longer have to specify juju-deployer <target_name> so we drop <target_name> from the commandline. All services and relations defined within that single bundle file are assumed as desired config.

--- background ---

./dev/deployer calls juju-deployer <target-name> and <target-name> only existed in our /tmp/99-local.yaml file when we moved to our v4 bundles. As such, the only thing juju-deployer saw fit to deploy was the landscape-server service as defined in /tmp/*/99-local.yaml.

Abridged samples below:

--- charm bundles v3 (landscape-dense-maas.yaml) ---
landscape-dense-maas: <--- high level target name
    series: trusty
    services:
        <blah>

--- charm bundles v4 (landscape-dense-maas.yaml) ---
                               <--- no longer have a target name
series: trusty
services:
    <blah>

---- tempfile /tmp/*/99-local.yaml created for overrides ----
landscape-dense-maas:
  services:
    landscape-server:
      charm: landscape-server
      options:
        license-file: include-file:///home/csmith/src/landscape/trunk/build/landscape-charm/config/license-file
        source: include-file:///home/csmith/src/landscape/trunk/build/landscape-charm/config/repo-file

To test:

# Without these changes you'll see juju status should only landscape-server service on machine 1 instead of machine 0
juju bootstrap # beret stack
make stage-landscape-charm # on trunk
make -C build/landscape-charm deploy-dense-maas-dev
juju status

# With changes juju status will show landscape-server, haproxy and postgres all in lxcs or smooshed on machine 0