Add tools-stream config to allow tools from different streams to be used
Merge pull request #797 from axw/upgrades-image-metadata

upgrades: migrate uploaded image metadata to environment storage

We no longer search for image metadata in provider storage.
This is the final piece: migrate existing metadata from provider
storage to environment storage, preserving paths and data exactly.
Fix the panic when no running environment.
Add apt_preferences file with bootcmd

The apt_preferences file must be written
before we run "apt-get upgrade", or the
pinning does not take effect on non-bootstrap
machines.

Fixes https://bugs.launchpad.net/juju-core/+bug/1370781
Tweak a test that assumed sort order.
Fix yucky code
Add deprecation warning
provider/openstack: don't fail if product-streams isn't defined

Fixes https://bugs.launchpad.net/juju-core/+bug/1371605
Merge branch 'master' of https://github.com/juju/juju into hook-queue-2
moved metricsender to apiserver
Merge pull request #809 from axw/lp1371605-provider-openstack-keystoneurl

provider/openstack: don't fail if product-streams isn't defined

Fixes https://bugs.launchpad.net/juju-core/+bug/1371605
update imports
Factory methods using tags for user parameters.
Limit adding and sending metrics to the collect-metrics hook.
only an environment manager can access the metrics api
Merge pull request #805 from wallyworld/tools-stream

Add tools-stream config to allow tools from different streams to be used
Add tools datasource registration framework
Remove provider storage from tools search path

Also, register OpenStack keystone search path for tools.
Revert name change
Fix azure, local, maas provider