command line: Forward --timeout values to caliper as --time-limit.
am: 341c080d7b

Change-Id: Iaf1f1d884269382820e45f51ae4488b058ac271d