Removed 'setmaxstorage' option for oo-admin-ctl-user script.
Added 'setmaxtrackedstorage' and 'setmaxuntrackedstorage' options for oo-admin-ctl-user script.
Updated oo-admin-ctl-user man page.
Max allowed additional fs storage for user will be 'max_untracked_addtl_storage_per_gear' capability + 'max_tracked_addtl_storage_per_gear' capability.
Don't record usage for additional fs storage if it is less than 'max_untracked_addtl_storage_per_gear' limit.
Fixed unit tests and models to accommodate the above change.
Merge pull request #2230 from pravisankar/dev/ravi/card559

Merged by openshift-bot