Revert "Removed cap for mac override and change the label for connman dir"