Started cleaning up assertExpectedDeployment
Merge branch 'acceptance-tests-315' of github.com:ClusterHQ/flocker into acceptance-tests-315
Start of working around the MongoDB race condition