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

3fe5c2e Fix ci for python 2
0bc092f Fix node rebooting procedure

Change-Id: Ia88d9eea71d1979e853a198489ae0e5d8e5638fd