Fixing launch on new cluster functionality for jobs

Fixes:  bug 1259986

Change-Id: I2edf5764e4852c285e0591aa0775bb02c6fe93c9
Merge "Fixing launch on new cluster functionality for jobs"