MDL-42081 EditPDF: Add default stamp images
Merge branch 'MDL-42081-master-nomerge2' of git://github.com/mouneyrac/moodle
Merge branch 'MDL-42683-master-2' of git://github.com/mouneyrac/moodle

Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
MDL-42699 TinyMCE: adding padding to editor content in clean
MDL-42699 Bootstrap tinymce css. Whitespace fix.
Merge branch 'wip-MDL-40612-master-one' of git://github.com/abgreeve/moodle
MDL-42803 behat: Fix random behat errors in CI
Merge branch 'wip-mdl-42795' of https://github.com/rajeshtaneja/moodle
MDL-42808 library: Google API was resetting the timezone
MDL-42809 ActionMenu: Increase specifity of hide on select selector
MDL-42711 theme port from LM - this makes the li's link inherit similar size from higher up in cascade.
MDL-42711 theme port from LM: fixed up choice results table overflowing to the right. (MDLSITE-2497)
MDL-42081 fix file_storage phpunit tests following adding new stamp files on fresh install
MDL-42805 dock: fixed {} appearing in undock icon title
MDL-42806 dock: check title exists before using it
MDL-41392 course: management accessibility tweaking
MDL-41392 course: management checkbox accessibility improvement
Merge branch 'MDL-42803-master' of git://github.com/ankitagarwal/moodle
MDL-42806 block_mentees: can only be docked if it has a valid title set.
MDL-42754 Messages: Fixed typo