Merge changes from topic "rm_changes" into main

* changes:
  resourcemanager: protect resources from concurrent access
  resourcemanager: use std::vector for ResourceList