A sketch of an implementation.
Merge remote-tracking branch 'refs/remotes/origin/master' into inspect-local-container-volumes-286

Conflicts:
	flocker/node/_model.py
Disable sketch, get existing tests passing again.
Tests and implementation for adding volume information to discovered
node configuration.
Merge remote-tracking branch 'refs/remotes/origin/master' into inspect-local-container-volumes-286

Conflicts:
	flocker/node/_model.py
	flocker/node/test/test_deploy.py
Integrate VolumeService into flocker-changestate.
Pass in all arguments.
Pacify the PEP 8 gods.
Address review comment: Link to issue for better API location.
Address review comment: Better formatting, and content while I'm at it.
Address review comment: Remove reference to non-existent parameter.
Address review comment: Generator expressions.
Address review comment: Fix markup.
Address review comment: The Norman conquest is not forgotten.
Address review comment: Link to issue that will improve the test.
Fix flake8 issue.
Merge pull request #302 from ClusterHQ/inspect-local-container-volumes-286

Local configuration discovery includes volumes.

Fixes #286.
Fixes #124.