[JENKINS-23231] - Add timeout parameter.  Remove IDE formatting changes
to aid merge/review.