Merge pull request #17068 from colemanw/currentPath

[REF] Reconcile CRM_Utils_System::getUrlPath and CRM_Utils_System::currentPath

diff --cc CRM/Core/Page/QUnit.php
Simple merge

diff --cc CRM/Core/Resources.php
Simple merge

diff --cc CRM/Report/Utils/Report.php
Simple merge

diff --cc CRM/Utils/System.php
Simple merge