Merge "QA: updates to edit test ported from qa/browsertests"