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

81244e1 Re-order second run openssh state

Change-Id: I4ef8d39057cb983d9b9917d2e877de5314faf1ce