Be a little more flexible when matching bot callin requests.

Change-Id: I522c981106af632239d6f14abf62a4399204ae70