Use assertExpectedDeployment in test_moving_applications
Merge branch 'acceptance-tests-315' of github.com:ClusterHQ/flocker into acceptance-tests-315

Conflicts:
	flocker/acceptance/utils.py