432468 Improve command CGI path handling
404511 removed deprecated StringMap