Fix supervisord bug
Add MADEIRA_TMP
Merge branch 'develop' of github.com:MadeiraCloud/salt into develop