Merge "Changes features for odl-groupbasedpolicy-vpp"