add ability to wait between replanning attempts
Merge remote-tracking branch 'upstream/groovy-devel' into groovy-devel