Fix for CLOUDSTACK-5864

Fixed the mentioned issue.

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>