Merge lp://qastaging/~ahasenack/landscape-charm/new-bundle-render into lp://qastaging/~landscape/landscape-charm/bundles-stable

Sync bundle generation with what we have in bundles-trunk so that both produce the same set of files and directories. The content is still the same as it was before this branch.

Sync bundle generation with what we have in bundles-trunk so that both produce the same set of files and directories. The bundle content is still the same as it was before this branch.

I also added a small fix to the diff script so that it ignores the bundles.yaml (note the plural) file which is not used and is just an artifact of the charm store.

The diff is a bit big, here is what I did:
- merged with bundles-trunk
- removed the individual non-template yaml files representing each bundle: there are now generated and not part of the branch
- added --exclude bundles.yaml to the diff action in the charm-store diff

Everything else is a result of the merge from bundles-trunk.

To test:
charm login
charm whoami (to verify login). You may have to login on jujucharms.com with a browser before for all this to work (known bug in the charm store)

export CHARM_STORE_USER=landscape
make diff-charm-store

Should show no diff, because the rendered bundles match what is in the charm store currently. The rendered bundles are in the build/ directory.

Another test you can do:
make update-charm-revisions
bzr diff landscape-template.jinja2

Should show charm revision updates, still for the trusty series.

Bump to xenial:
bzr revert (if you ran the test above)
export EXTRA_UPDATE_ARGUMENTS="--series xenial"
make update-charm-revisions
bzr diff landscape-template.jinja2

That should bump all bundles to xenial and latest charm revisions

I just didn't test the actual push and publish commands (makefile targets).