Revert "config: WIP on supporting key/value indexing to config overrides"

This reverts commit 2b6534d1cb2ed8296d2037e50421887efca149f8.
Fixed findbugs nullcheck issue