Merge proposals dependent on lp://staging/~clint-fewbar/ubuntu/precise/apache2/fix-ask-for-passphrase

1. Precise (12.04)
2. fix-ask-for-passphrase
3. Dependent merge proposals