[develop]
fix not input package version bug in verify_ret
Merge branch 'develop'
Merge branch 'master' of https://github.com/MadeiraCloud/salt
Merge branch 'develop' of https://github.com/MadeiraCloud/salt into develop
Merge branch 'master' of https://github.com/MadeiraCloud/salt
[develop]
fix supervisord module bug
Merge branch 'develop'