Merge "Add option to disable contrail DNS"