Merge lp://qastaging/~corey.bryant/charms/trusty/keystone/amulet-updates into lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next

Makefile (+2/-1)
hooks/charmhelpers/contrib/hahelpers/apache.py (+10/-3)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+1/-2)
hooks/charmhelpers/contrib/network/ip.py (+100/-16)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+35/-7)
hooks/charmhelpers/contrib/openstack/amulet/utils.py (+5/-4)
hooks/charmhelpers/contrib/openstack/context.py (+75/-24)
hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+9/-0)
hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend (+9/-8)
hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend.conf (+9/-8)
hooks/charmhelpers/contrib/openstack/utils.py (+1/-0)
hooks/charmhelpers/contrib/peerstorage/__init__.py (+27/-29)
hooks/charmhelpers/core/hookenv.py (+42/-16)
hooks/charmhelpers/core/host.py (+30/-5)
hooks/charmhelpers/core/services/base.py (+3/-0)
hooks/charmhelpers/core/services/helpers.py (+119/-5)
hooks/charmhelpers/fetch/__init__.py (+19/-5)
hooks/charmhelpers/fetch/archiveurl.py (+49/-4)
tests/00-setup (+4/-2)
tests/README (+6/-0)
tests/basic_deployment.py (+24/-16)
tests/charmhelpers/contrib/amulet/deployment.py (+19/-13)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+36/-7)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+5/-4)