Revert "Clear exception when keypair issue with --config-on-master"

This reverts commit a2635007453d0ebb1f21ccfb6519e3aee50ab300.
Merge branch 'vanilla_improvements' into datacratic_dev