Minor fixes in oo-admin-ctl-district/oo-admin-ctl-region
Fix error message in case of invalid name for region/zone/district
Merge pull request #4681 from pravisankar/dev/ravi/misc-bugfixes

Merged by openshift-bot
test cleanup