Merge pull request #350 from tzz/master

Vagrant and New Relic fixes
tools/test/vagrant: do a cf-hub poll in the convergence step