p2p: gives seednode priority over dnsseed if both are provided#11

adamjonas wants to merge 2 commits intobitcoin-fresheyes-staging-master-28016adamjonas/bitcoin:bitcoin-fresheyes-staging-master-28016from

sr-gi-fresheyes-staging-dnsseed-priority-28016adamjonas/bitcoin:sr-gi-fresheyes-staging-dnsseed-priority-28016Copy head branch name to clipboard