build : merge oss_core from edits done in dns-views branch