CLOUDSTACK-6222: Fix the marvin config generator scripts to include
new syntax changes in marvin code and fix the logFolderPath

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

Conflicts:
	tools/marvin/marvin/configGenerator.py