Derive test.timeout from system property. overload methods #2299
Merge pull request #2414 from sschwell/master

Make the timeout value for java testing configurable #2299
Merge remote-tracking branch: upstream/master