Fix for /admin/config and /admin/status responses.

CORE-5832 CORE-6112