Revert "engine: VdsDeploy cleanup 1"

This reverts commit ee531b788e880e60cae87d82c3553239f2eb7778.

Change-Id: I1f964a0474dbd6ffabe531bd995ad4abbf4381d6
Signed-off-by: Alon Bar-Lev <alonbl@redhat.com>
Partial Revert "engine: unit test for VdsDeploy.getEngineSSHPublicKey"

This reverts commit 4b387e8d8ff0bc11ef6901ae9e4ecb9b12c938b8.

Change-Id: I38fa07c853d202bb4bdcd83cdb658fff0864b758
Signed-off-by: Alon Bar-Lev <alonbl@redhat.com>