the serverAddress is added as dns if dns1 is empty
in commit aea743aa
but it was reverted by commit 2c08ede3.
so partially revert it.
without this change p2p connection raise NullPointerException and kill
system services.
Change-Id: I194fb5e4d8fb577d18cb10f61782aec1cd80220e
