am 1a706865: Merge "Fix const-ness of strrchr callers."

* commit '1a706865307f4fbb2397cb3ca2eefad4ff6f83ea':
  Fix const-ness of strrchr callers.