Merge "Cleanup features.xml files" into topic/netvirtsb