Merge "Removed cap for mac override and change the label for resolv configuration...