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.
minor fixes
Bug 956964: Collect teardown output on cart deconfigure
Env var WIP.

Fix publish hooks for mongo, postgres; remove unnecessary hooks; fix python, php manifests.

Fix manifests for remaining carts.

Fix v1 args.

Add code to convert args.

Load env vars from sub directories.

Add oo_unsubscribe to mcol agent.

Fixes.

Fixes.
Add a link-block class
Preventing false positives from being reported for oo-admin-chk and bug fixes
 - Fix for bug 954800
 - Fix for bug 955187
 - Fix for bug 955359
Displaying the count of applications fixed/failed for ssh key mismatches
Merge pull request #2277 from danmcp/master

Merged by openshift-bot
Merge pull request #2276 from ironcladlou/bz/956967

Merged by openshift-bot
Bug 957883 - git clone was getting stuck asking for a password in remote repository and no amount of redirecting or closing stdin prevented a deadlock.
Merge pull request #2230 from pravisankar/dev/ravi/card559

Merged by openshift-bot
Merge pull request #2280 from mrunalp/dev/auto_env_vars

Merged by openshift-bot
Merge pull request #2281 from smarterclayton/add_link_block

Merged by openshift-bot
Merge pull request #2279 from abhgupta/abhgupta-dev

Merged by openshift-bot
Merge pull request #2283 from rmillner/BZ957883

Merged by openshift-bot