Hygiene: Lift and shift editor code to correct step files

Change-Id: I240f573b91c13205756f61a3e187b285012fe346
QA: Avoid VisualEditor timeout test failures on beta labs

VisualEditor can take a while to complete a save there, so this
additional step gives 15 seconds for the save to complete before checking
for the toast

Change-Id: I772ad5660de46758a1f19c6ad1b9f69c260e63ab
Merge "Hygiene: Lift and shift editor code to correct step files"
Merge "QA: Avoid VisualEditor timeout test failures on beta labs"