OFAgent: Merge br-int and br-tun

Change-Id: I7d7dd17a7938d67627e817a6e5c6310c320e638c
Merge "OFAgent: Merge br-int and br-tun"