Fix starting instances after scaling for CDH

Change-Id: I13059a3349d95598e9f857d022ff04f9a6a07364
Closes-bug: #1354430
Merge "Fix starting instances after scaling for CDH"