Merge pull request #299 from bhariharan/unstable20

Fix Remaining Tests (Sample Apps and Plugins)
Fix VFConnector tests