Fixed issues in CLOUDSTACK-6489

Fixed issues for CLOUDSTACK-6489
Along with fixed few indent issues.

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>