Some variables were deprecated in rocky and marked for removal in Ussuri We do replace them not to have things broken afterwards. Change-Id: I75d2e3631b0dfebb72efd946fd61252bb9b766b0 Related-Bug: #1846052