Bug 811528 - pref native identity on
Merge pull request #6845 from jedp/811528-pref-identity-on

Bug 811528 - pref native identity on; r=ferjm
Auto-merge from branch 'master'