Fixed Regression issues mentioned under CLOUDSTACK-6708

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

Conflicts:

	test/integration/smoke/test_deploy_vm.py
	test/integration/smoke/test_network.py
	test/integration/smoke/test_routers.py
	test/integration/smoke/test_vm_life_cycle.py