changed to wait longer for server to come up #869
Merge branch 'bugfixes/tokumx-1.3'