Merge pull request #961 from ClusterHQ/idockerclient-limits-960

Idockerclient limits 960
Merge branch 'master' into flocker-app-resource-limits-FLOC-961