Lint fixes.
Merge branch 'docker-client-64' of github.com:ClusterHQ/flocker into docker-client-64