update msautotests for #4622
Merge branch 'branch-6-2'