Merge proposals dependent on lp://staging/~dpb/charms/precise/apache2/apache2-fixes

lp://staging/~dpb/charms/precise/apache2/apache2-fixes has no merge proposals.