Merge branch 'wip-mdl-42537' of https://github.com/rajeshtaneja/moodle

Conflicts:
	lib/upgrade.txt

diff --cc lib/moodlelib.php
Simple merge

diff --cc lib/upgrade.txt
index 5ca4904,e683953..2db1ecd
--- 1/lib/upgrade.txt
--- 2/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@@ -52,8 -52,8 +52,10 @@@ information provided here is intended e
  * New class introduced to help auto generate zIndex values for modal dialogues. Class "moodle-has-zindex"
    should set on any element which uses a non-default zindex and needs to ensure it doesn't show above a
    dialogue.
 +* $CFG->filelifetime is now used consistently for most file serving operations, the default was lowered
 +  to 6 hours from 24 hours because etags and x-sendfile support should make file serving less expensive.
+ * Date format locale charset for windows server will come from calendar type and for gregorian it will use
+   lang file.
  
  DEPRECATIONS:
  Various previously deprecated functions have now been altered to throw DEBUG_DEVELOPER debugging notices