Merge "Warn on session access in profileinfo.php and opensearch_desc.php"