am c739de01: Merge "Avoid use of std::string where we have const char*." into lmp-dev

* commit 'c739de01b905729b8587003a52a55b62358e979d':
  Avoid use of std::string where we have const char*.