Add includesMatchedAddr to AddrBook, fix bug due to local address issues in BeaconClock

- this requires 3.7

Signed-off-by: Scott Wilson <i@scottwilson.ca>