CLOUDSTACK-6316: Fixed issues in various files(testcases and marvin related)

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>