Merge "RA: Add capability for Policy driven VlanTags"