IRB Changes

Change-Id: I807896addc7a59620db8a3e49493ce2ea5e8de84
Merge remote-tracking branch 'juniper/master' into freebsd

Conflicts:
	dp-core/vr_datapath.c
	dp-core/vr_flow.c
	include/vr_interface.h