Merge proposals dependent on lp://staging/~brad-marshall/charms/trusty/apache2-wsgi/fix-haproxy-relations

lp://staging/~brad-marshall/charms/trusty/apache2-wsgi/fix-haproxy-relations has no merge proposals.