Revert "Revert "Merge pull request #3029 from edx/revert-2990-saleem-latif/MAYN-198""

This reverts commit 44107557, reversing
changes made to 4e5122de.

* mattdrayer: Update command syntax + add SSH key cleanup