Added fix for CLOUDSTACK-6389
Added fix for CLOUDSTACK-6389

Added changes for CLOUDSTACK-6389.
More details in the bug.

Signed-off-by: Santhosh Edukulla <9d91864275db55c90a2eed8538a9c0c996f240a7@citrix.com>
Signed-off-by: SrikanteswaraRao Talluri <35d46b2ff1bf95340df8625bc8fcffc8da6fadb0@apache.org>

resmo/cloudstack,jcshen007/cloudstack,DaanHoogland/cloudstack,GabrielBrascher/cloudstack,wido/cloudstack,resmo/cloudstack,wido/cloudstack,GabrielBrascher/cloudstack,jcshen007/cloudstack,wido/cloudstack,wido/cloudstack,GabrielBrascher/cloudstack,DaanHoogland/cloudstack,DaanHoogland/cloudstack,jcshen007/cloudstack,GabrielBrascher/cloudstack,wido/cloudstack,wido/cloudstack,jcshen007/cloudstack,resmo/cloudstack,GabrielBrascher/cloudstack,jcshen007/cloudstack,DaanHoogland/cloudstack,DaanHoogland/cloudstack,DaanHoogland/cloudstack,DaanHoogland/cloudstack,GabrielBrascher/cloudstack,jcshen007/cloudstack,resmo/cloudstack,wido/cloudstack,resmo/cloudstack,resmo/cloudstack,jcshen007/cloudstack,resmo/cloudstack,GabrielBrascher/cloudstack