Added options to help prevent hanging during salt-minion deploy on Ubuntu