simplified tests
updated variable names in tests
return deferred from callbacks in functional tests
Merge pull request #963 from ClusterHQ/flocker-app-resource-limits-FLOC-961

Flocker app resource limits floc 961
addresses review comments
Merge pull request #965 from ClusterHQ/flocker-config-resource-limits-FLOC-963

Flocker config resource limits floc 963
Merge branch 'master' into fig-config-memory-limit-FLOC-962