fixing callback missing in case of --no-ssh-password
Merge remote-tracking branch 'upstream/dev' into dev
Merge pull request #1004 from anumsopentech/dev

Dev