v3008.0
Merge branch '3007.x' into merge/3007.x/3008.x/25-05-26
Add back accidentially deleted pkg sub-dir.
Fix merge warts