Merge branch 'm36_MDL-63789_Search_SOLR_Fixes_Proxy_Auth' of https://github.com/scara...