fixes in adaptor
fixes
Add general.comment mod
Merge branch 'develop' of github.com:MadeiraCloud/salt into develop
Merge branch 'develop'