Enable EDP with HDP plugin

Some changes and fixes to allow for the submission of EDP jobs
to an HDP spawned cluster.

Change-Id: I1a42c756919e8b0e513f49649d4375c6b216e22a
Merge "Enable EDP with HDP plugin"