Add timeout param for execution_thread.join

Having timeout is necessary for the FlowExtension.

Change-Id: I0b8b937595cd6daa64f6a69dc6b1042bba2724c8
Merge "Add timeout param for execution_thread.join"