add an explicit wait for 2nd stage step in sle11
Merge branch 'master' into sle12