added polling to functional test to wait for servers to start
added 10 second timeout to _wait_until_up
cleaned up loop
Merge branch 'develop' into add-polling-to-functional-tests
Merge pull request #314 from jacksingleton/add-polling-to-functional-tests

Add polling to functional tests