Add support for general config load without hostname.

Change-Id: I383b60e0fec583c99620dd3cbfeb4c26e59ad125