<oo-diagnostics> fix bug in District methods, redirect httpd broken version to kbase
Bug 912819
Merge pull request #1422 from sosiouxme/diagnostics

Merged by openshift-bot
Merge pull request #1423 from bdecoste/master

Merged by openshift-bot
Adding netrc rest-client dependency for broker in development/test mode
Removing references to cgconfig/all