saltstack/salt — pull request #15943 by thatch45 (2014-09-18 21:13:57+00:00)
Title: Make the error on passwords float up to the key_deploy catch

This fixes a number of issues, including the password prompt being clobbered #10613

Or rather this finishes fixing them