More on local peer detection.
Merged frostwire-common changes