Merge pull request #462 from vedujoshi/master

Add retry to accomodate slow VM environments
change testcase in accrordance with new user fixture
Try fix for one of virtual testbed issue reported by Ananth