Bug 707188 - bad accesskeys due to bug 246243
Merge migration changes from aurora