Flocker config resource limits floc 963

Fixes FLOC-963

(merge #963 before reviewing this, as those changes are currently merged in to this branch for testing)