Merge proposals dependent on lp://qastaging/~adam-collard/charms/trusty/apache2/apache2-charmhelpers-fix

lp://qastaging/~adam-collard/charms/trusty/apache2/apache2-charmhelpers-fix has no merge proposals.