Merge lp://staging/~canonical-sysadmins/charms/trusty/apache2/apache2-storage into lp://staging/charms/trusty/apache2

I ran into two failures when running bundletester on this charm:

1) "make lint" fails due to a missing flake8 dependency.
2) "make test" fails, as the new code breaks the mocking strategy for one of the existing tests.

Specifically, hooks.tests.ConfigChangedTest.test_config_changed_empty_site_dir fails.

This is because the test patches out config_get, and has it return a mock config object. You can fix the test by doing one of the following:

1) Make the mock more complex, so that you can do config_get("foo"), and get back what you expect.
2) Change line 42 of hooks.py to something like the following:

    set([int(p) for p in config_get()['extra_ports'].split()])

(You may then need to populate 'extra_ports' in the mock config with a list suitable for testing purposes.)

Testing failures aside, I was able to deploy this manually without errors, and the code looks solid.
Once "make test" passes, I am +1 on merging this.

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5013/

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/4810/

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5021/

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5028/

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/4817/

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/4822/

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5036/

Old so rejecting.