Fixes: #2896 fixed autofs dns
Fixes: #2410 Cleaned some plugin code