Merge with tag public-0.6 (src/vnsw/dp)
Add missing files