Topology discovery failing in latest master (Aug 21st 2015)

Some change after ONOS-2186-GUI on Aug 20 seem to be causing issue with topology discovery.
I see that it works in my test cluster up to the changes from Simon.
######################################
admin@chONOSbench:~/onos$ git log -1
commit c6f81bca406f8908ababeec6aa511461ad366c76
Author: Bharat saraswal <bharat.saraswal@huawei.com>
Date: Fri Aug 21 16:14:56 2015 +0530

ONOS-2344Implementation of PCEP report messages.

Change-Id: I9258a34ad7b09a583dcd0e56f90a36958c3acb34
admin@chONOSbench:~/onos$ ot
rw-rw-r- 1 admin admin 97M Aug 21 10:17 /tmp/onos-1.3.0.admin.tar.gz
10.128.40.41: Fri Aug 21 10:17:42 PDT 2015
10.128.40.42: Fri Aug 21 10:17:42 PDT 2015
10.128.40.43: Fri Aug 21 10:17:42 PDT 2015
10.128.40.50: Fri Aug 21 10:17:43 PDT 2015
Connection to 10.128.40.41 closed.
Connection to 10.128.40.42 closed.
Connection to 10.128.40.43 closed.
admin@chONOSbench:~/onos$

onos>
onos> summary
node=10.128.40.41, version=1.3.0.admin~2015/08/21@10:17
nodes=3, devices=25, links=0, hosts=0, SCC(s)=25, flows=0, intents=0
onos>

######################################
admin@chONOSbench:~/onos$ ot
rw-rw-r- 1 admin admin 97M Aug 21 10:13 /tmp/onos-1.3.0.admin.tar.gz
10.128.40.41: Fri Aug 21 10:13:14 PDT 2015
10.128.40.42: Fri Aug 21 10:13:14 PDT 2015
10.128.40.43: Fri Aug 21 10:13:15 PDT 2015
10.128.40.50: Fri Aug 21 10:13:15 PDT 2015
Connection to 10.128.40.41 closed.
Connection to 10.128.40.42 closed.
Connection to 10.128.40.43 closed.
admin@chONOSbench:~/onos$
admin@chONOSbench:~/onos$ git log -1
commit 4fc8685ee2cde5ac660cb06ea9bf545754594fda
Author: Simon Hunt <simon@onlab.us>
Date: Thu Aug 20 17:57:52 2015 -0700

ONOS-2186 - GUI Topo Overlay - (WIP)

• split BiLink into abstract superclass and concrete subclasses.
• created BiLinkMap to collate bilinks (and derivative subclasses).
• added missing Javadocs, and other general cleanup.

Change-Id: Icfa85bc44a223c6cf245a4005170583dad1cc801
admin@chONOSbench:~/onos$
Hit '<tab>' for a list of available commands
and '[cmd] --help' for help on a specific command.
Hit '<ctrl-d>' or type 'system:shutdown' or 'logout' to shutdown ONOS.

onos> summary
node=10.128.40.41, version=1.3.0.admin~2015/08/21@10:13
nodes=3, devices=25, links=114, hosts=0, SCC(s)=1, flows=75, intents=0
onos>
onos> summary
node=10.128.40.41, version=1.3.0.admin~2015/08/21@10:13
nodes=3, devices=25, links=114, hosts=0, SCC(s)=1, flows=75, intents=0
onos>