Merge "Rename max.active.modems to active_modems.max_count" into rvc-dev