Testcommit floodlight/loxigen@83aebd39ef926160d52acaac072c095f338ec4cc...floodlight/loxigen@91354d1