Merge branch 'wip-MDL-34859-master' of git://github.com/marinaglancy/moodle

diff --cc lang/en/deprecated.txt
index a9c6b61,fcf0172..775171d
--- 1/lang/en/deprecated.txt
--- 2/lang/en/deprecated.txt
+++ b/lang/en/deprecated.txt
@@@ -62,10 -62,4 +62,11 @@@ userssearchresults,core_messag
  loginpasswordautocomplete,core_admin
  loginpasswordautocomplete_help,core_admin
  deletecomment,core
- signinwithyouremail,core_badges
 +personaconnection,core_badges
 +personaconnection_help,core_badges
 +error:noassertion,core_badges
 +error:personaneedsjs,core_badges
 +error:badjson,core_badges
 +error:backpackloginfailed,core_badges
++signinwithyouremail,core_badges
+ sectionusedefaultname,core

diff --cc lib/adminlib.php
Simple merge

diff --cc lib/formslib.php
Simple merge