Merge remote-tracking branch 'origin/master' into 'origin/2.0.0-release'

* origin/master:
  Send timeout arg from maven plugin to runner.

Change-Id: I14efa1d42cc465ecdf0cfbd1811ffd874ef5783f
Signed-off-by: Pavel Agapov <pavel.agapov@xored.com>