Merge the tip of origin/release/proposed/2019.2.0 into origin/release/2019.2.0

d7f866e Increase wait_timeout for Jenkins master

Change-Id: Ic1e0631c6064424f511444f2e655b2e3953c6de8