Fixed Regression issues mentioned under CLOUDSTACK-6708

Signed-off-by: santhosh <santhosh.edukulla@gmail.com>