Updated marvin tool with all the fixes from Citrix 3.0.x repo.
This branch now has all the latest testcases.