Clarification of issues
Merge branch 'automate-testing-577' of github.com:ClusterHQ/flocker into automate-testing-577