Merge lp://staging/~james-page/openstack-charm-testing/16.04-release into lp://staging/openstack-charm-testing

bundles/0mq/0mq.yaml (+0/-1)
bundles/baremetal/7-default.yaml (+24/-25)
bundles/baremetal/7-next.yaml (+1/-1)
bundles/baremetal/basic-default.yaml (+0/-1)
bundles/cells/cells-api.yaml (+0/-1)
bundles/cells/cells-cell1.yaml (+0/-1)
bundles/cells/cells-cell11.yaml (+0/-1)
bundles/cells/cells-cell2.yaml (+0/-1)
bundles/dev/11-default.yaml (+20/-21)
bundles/dev/hacluster-keystone-default.yaml (+1/-1)
bundles/dev/icehouse.yaml (+0/-1)
bundles/dev/neutron-breakout.yaml (+0/-1)
bundles/dev/ssl-everywhere.yaml (+0/-1)
bundles/keystone-v3/next.yaml (+1/-1)
bundles/leadership-election/leadership-election.yaml (+1/-2)
bundles/lxd/default.yaml (+26/-18)
bundles/lxd/source/default.yaml (+17/-18)
bundles/multi-hypervisor/default.yaml (+21/-22)
bundles/nsx/nsx.yaml (+11/-12)
bundles/ovs-odl/ovs-odl.yaml (+1/-1)
bundles/ppc64/deprecated/ppc64el-two-unit-method1.yaml (+0/-1)
bundles/ppc64/deprecated/ppc64el-two-unit-method2.yaml (+0/-1)
bundles/ppc64/powerkvm-fullstack.yaml (+16/-16)
bundles/ppc64/powerkvm-two-unit-dense.yaml (+10/-10)
bundles/source/default.yaml (+23/-24)
bundles/source/next.yaml (+1/-1)
bundles/sparse/default.yaml (+23/-24)
bundles/sparse/next.yaml (+1/-1)